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/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/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
index a8c773a3054..1edcb0a3455 100644
--- a/keyboards/25keys/zinc/rules.mk
+++ b/keyboards/25keys/zinc/rules.mk
@@ -1,4 +1 @@
 DEFAULT_FOLDER = 25keys/zinc/rev1
-
-#SRC += i2c.c
-SRC += serial.c
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/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/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/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/keyboard.json
similarity index 100%
rename from keyboards/acheron/shark/alpha/info.json
rename to keyboards/acheron/shark/alpha/keyboard.json
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/keyboard.json
similarity index 100%
rename from keyboards/adafruit/macropad/info.json
rename to keyboards/adafruit/macropad/keyboard.json
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/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/keyboard.json
similarity index 100%
rename from keyboards/aeboards/ext65/rev3/info.json
rename to keyboards/aeboards/ext65/rev3/keyboard.json
diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/keyboard.json
similarity index 100%
rename from keyboards/aeboards/satellite/rev1/info.json
rename to keyboards/aeboards/satellite/rev1/keyboard.json
diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/keyboard.json
similarity index 100%
rename from keyboards/ai03/lunar_ii/info.json
rename to keyboards/ai03/lunar_ii/keyboard.json
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/al1/info.json b/keyboards/al1/keyboard.json
similarity index 100%
rename from keyboards/al1/info.json
rename to keyboards/al1/keyboard.json
diff --git a/keyboards/alas/info.json b/keyboards/alas/keyboard.json
similarity index 100%
rename from keyboards/alas/info.json
rename to keyboards/alas/keyboard.json
diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/keyboard.json
similarity index 100%
rename from keyboards/aliceh66/pianoforte/info.json
rename to keyboards/aliceh66/pianoforte/keyboard.json
diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/keyboard.json
similarity index 100%
rename from keyboards/aliceh66/pianoforte_hs/info.json
rename to keyboards/aliceh66/pianoforte_hs/keyboard.json
diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/keyboard.json
similarity index 100%
rename from keyboards/amjkeyboard/amj66/info.json
rename to keyboards/amjkeyboard/amj66/keyboard.json
diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/keyboard.json
similarity index 100%
rename from keyboards/amjkeyboard/amj96/info.json
rename to keyboards/amjkeyboard/amj96/keyboard.json
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/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/arrowmechanics/wings/info.json b/keyboards/arrowmechanics/wings/keyboard.json
similarity index 100%
rename from keyboards/arrowmechanics/wings/info.json
rename to keyboards/arrowmechanics/wings/keyboard.json
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/aurora65/info.json b/keyboards/aurora65/keyboard.json
similarity index 100%
rename from keyboards/aurora65/info.json
rename to keyboards/aurora65/keyboard.json
diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/keyboard.json
similarity index 100%
rename from keyboards/axolstudio/helpo/info.json
rename to keyboards/axolstudio/helpo/keyboard.json
diff --git a/keyboards/baion_808/info.json b/keyboards/baion_808/keyboard.json
similarity index 100%
rename from keyboards/baion_808/info.json
rename to keyboards/baion_808/keyboard.json
diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/keyboard.json
similarity index 100%
rename from keyboards/bajjak/info.json
rename to keyboards/bajjak/keyboard.json
diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/keyboard.json
similarity index 100%
rename from keyboards/barleycorn_smd/info.json
rename to keyboards/barleycorn_smd/keyboard.json
diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/keyboard.json
similarity index 100%
rename from keyboards/basketweave/info.json
rename to keyboards/basketweave/keyboard.json
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
index 1bf0d489a97..d6eda5c2d10 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
index 0869ac07972..7f2338227af 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
index 0869ac07972..7f2338227af 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
index 03b7e8ca31a..8753565dfbc 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
index 03b7e8ca31a..8753565dfbc 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
index 1bf0d489a97..d6eda5c2d10 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
index 1bf0d489a97..d6eda5c2d10 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
index 0869ac07972..7f2338227af 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
index 0869ac07972..7f2338227af 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
index 03b7e8ca31a..8753565dfbc 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
index 03b7e8ca31a..8753565dfbc 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
index 1bf0d489a97..d6eda5c2d10 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
index e2a00339775..9e797122a74 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
index e1f2bf81f8f..808675da02b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
index e1f2bf81f8f..808675da02b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
index 03b7e8ca31a..8753565dfbc 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
index 03b7e8ca31a..8753565dfbc 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
index 1bf0d489a97..d6eda5c2d10 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
index 20c87fca307..0875a191c5d 100644
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ b/keyboards/bastardkb/scylla/blackpill/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
index 6221b2ef6a5..a8a3e3d5873 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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)
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
index 6221b2ef6a5..a8a3e3d5873 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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)
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index 83407eef806..d5f1d335c89 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
index 83407eef806..d5f1d335c89 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index ef125eb2fea..3834385af03 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
index 20c87fca307..0875a191c5d 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
index 6221b2ef6a5..a8a3e3d5873 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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)
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
index 6221b2ef6a5..a8a3e3d5873 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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)
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
index 83407eef806..d5f1d335c89 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
index 83407eef806..d5f1d335c89 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
index ef125eb2fea..3834385af03 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
deleted file mode 100644
index 40c33619d19..00000000000
--- a/keyboards/bastardkb/tbk/info.json
+++ /dev/null
@@ -1,102 +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": {
-        "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/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 2eba275490a..00000000000
--- a/keyboards/bastardkb/tbk/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 = 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/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
index 20c87fca307..0875a191c5d 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk
+++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
index 6221b2ef6a5..a8a3e3d5873 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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)
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
index 6221b2ef6a5..a8a3e3d5873 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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)
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
index 83407eef806..d5f1d335c89 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
index 83407eef806..d5f1d335c89 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
index ef125eb2fea..3834385af03 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 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 functionality
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/keyboard.json
similarity index 100%
rename from keyboards/bbrfkr/dynamis/info.json
rename to keyboards/bbrfkr/dynamis/keyboard.json
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/bioi/g60/info.json b/keyboards/bioi/g60/keyboard.json
similarity index 100%
rename from keyboards/bioi/g60/info.json
rename to keyboards/bioi/g60/keyboard.json
diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/keyboard.json
similarity index 100%
rename from keyboards/bioi/g60ble/info.json
rename to keyboards/bioi/g60ble/keyboard.json
diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/keyboard.json
similarity index 100%
rename from keyboards/bioi/morgan65/info.json
rename to keyboards/bioi/morgan65/keyboard.json
diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/keyboard.json
similarity index 100%
rename from keyboards/boardsource/equals/48/info.json
rename to keyboards/boardsource/equals/48/keyboard.json
diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/keyboard.json
similarity index 100%
rename from keyboards/boardsource/equals/60/info.json
rename to keyboards/boardsource/equals/60/keyboard.json
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/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
deleted file mode 100644
index 5ced95c018b..00000000000
--- a/keyboards/boston_meetup/2019/info.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "usb": {
-        "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
-}
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/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/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/keyboard.json
similarity index 100%
rename from keyboards/bpiphany/ghost_squid/info.json
rename to keyboards/bpiphany/ghost_squid/keyboard.json
diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/keyboard.json
similarity index 100%
rename from keyboards/bpiphany/hid_liber/info.json
rename to keyboards/bpiphany/hid_liber/keyboard.json
diff --git a/keyboards/bpiphany/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk
index 1b9ebdb1312..3215e3588a3 100755
--- a/keyboards/bpiphany/hid_liber/rules.mk
+++ b/keyboards/bpiphany/hid_liber/rules.mk
@@ -1,4 +1,2 @@
-CUSTOM_MATRIX = yes         # Custom matrix file
-
-# Project specific files
+CUSTOM_MATRIX = yes
 SRC = matrix.c
diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/keyboard.json
similarity index 100%
rename from keyboards/bpiphany/kitten_paw/info.json
rename to keyboards/bpiphany/kitten_paw/keyboard.json
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/info.json b/keyboards/bpiphany/tiger_lily/keyboard.json
similarity index 100%
rename from keyboards/bpiphany/tiger_lily/info.json
rename to keyboards/bpiphany/tiger_lily/keyboard.json
diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/keyboard.json
similarity index 100%
rename from keyboards/bpiphany/unloved_bastard/info.json
rename to keyboards/bpiphany/unloved_bastard/keyboard.json
diff --git a/keyboards/budgy/info.json b/keyboards/budgy/keyboard.json
similarity index 100%
rename from keyboards/budgy/info.json
rename to keyboards/budgy/keyboard.json
diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/keyboard.json
similarity index 100%
rename from keyboards/buzzard/rev1/info.json
rename to keyboards/buzzard/rev1/keyboard.json
diff --git a/keyboards/cablecardesigns/phoenix/info.json b/keyboards/cablecardesigns/phoenix/keyboard.json
similarity index 100%
rename from keyboards/cablecardesigns/phoenix/info.json
rename to keyboards/cablecardesigns/phoenix/keyboard.json
diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/aella/info.json
rename to keyboards/cannonkeys/aella/keyboard.json
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/an_c/info.json
rename to keyboards/cannonkeys/an_c/keyboard.json
diff --git a/keyboards/cannonkeys/bakeneko60_iso_hs/info.json b/keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/bakeneko60_iso_hs/info.json
rename to keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json
diff --git a/keyboards/cannonkeys/bakeneko65_iso_hs/info.json b/keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/bakeneko65_iso_hs/info.json
rename to keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json
diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/balance/info.json
rename to keyboards/cannonkeys/balance/keyboard.json
diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/brutalv2_65/info.json
rename to keyboards/cannonkeys/brutalv2_65/keyboard.json
diff --git a/keyboards/cannonkeys/chimera65_hs/info.json b/keyboards/cannonkeys/chimera65_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/chimera65_hs/info.json
rename to keyboards/cannonkeys/chimera65_hs/keyboard.json
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/cloudline/info.json
rename to keyboards/cannonkeys/cloudline/keyboard.json
diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/crin/info.json
rename to keyboards/cannonkeys/crin/keyboard.json
diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/devastatingtkl/info.json
rename to keyboards/cannonkeys/devastatingtkl/keyboard.json
diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/ellipse/info.json
rename to keyboards/cannonkeys/ellipse/keyboard.json
diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/ellipse_hs/info.json
rename to keyboards/cannonkeys/ellipse_hs/keyboard.json
diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/gentoo/info.json
rename to keyboards/cannonkeys/gentoo/keyboard.json
diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/gentoo_hs/info.json
rename to keyboards/cannonkeys/gentoo_hs/keyboard.json
diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/instant60/info.json
rename to keyboards/cannonkeys/instant60/keyboard.json
diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/instant65/info.json
rename to keyboards/cannonkeys/instant65/keyboard.json
diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json
deleted file mode 100644
index 49aaaddd525..00000000000
--- a/keyboards/cannonkeys/is0gr/info.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "manufacturer": "CannonKeys",
-    "keyboard_name": "is0GR",
-    "maintainer": "awkannan",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["B3"],
-        "rows": ["A15"]
-    },
-    "processor": "STM32F072",
-    "url": "https://cannonkeys.com",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x0028",
-        "vid": "0xCA04"
-    },
-    "community_layouts": ["ortho_1x1"],
-    "layouts": {
-        "LAYOUT_ortho_1x1": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0, "w": 1.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/cannonkeys/is0gr/keyboard.json b/keyboards/cannonkeys/is0gr/keyboard.json
new file mode 100644
index 00000000000..3f5e92a99c9
--- /dev/null
+++ b/keyboards/cannonkeys/is0gr/keyboard.json
@@ -0,0 +1,32 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "is0GR",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B3"],
+        "rows": ["A15"]
+    },
+    "processor": "STM32F072",
+    "url": "https://cannonkeys.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xCA04",
+        "vid": "0x0028"
+    },
+    "community_layouts": ["ortho_1x1"],
+    "layouts": {
+        "LAYOUT_ortho_1x1": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0, "w": 1.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/leviatan/info.json b/keyboards/cannonkeys/leviatan/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/leviatan/info.json
rename to keyboards/cannonkeys/leviatan/keyboard.json
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/malicious_ergo/info.json
rename to keyboards/cannonkeys/malicious_ergo/keyboard.json
diff --git a/keyboards/cannonkeys/meetuppad2023/info.json b/keyboards/cannonkeys/meetuppad2023/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/meetuppad2023/info.json
rename to keyboards/cannonkeys/meetuppad2023/keyboard.json
diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/moment/info.json
rename to keyboards/cannonkeys/moment/keyboard.json
diff --git a/keyboards/cannonkeys/moment_hs/info.json b/keyboards/cannonkeys/moment_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/moment_hs/info.json
rename to keyboards/cannonkeys/moment_hs/keyboard.json
diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/obliterated75/info.json
rename to keyboards/cannonkeys/obliterated75/keyboard.json
diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/onyx/info.json
rename to keyboards/cannonkeys/onyx/keyboard.json
diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/rekt1800/info.json
rename to keyboards/cannonkeys/rekt1800/keyboard.json
diff --git a/keyboards/cannonkeys/ripple/info.json b/keyboards/cannonkeys/ripple/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/ripple/info.json
rename to keyboards/cannonkeys/ripple/keyboard.json
diff --git a/keyboards/cannonkeys/ripple_hs/info.json b/keyboards/cannonkeys/ripple_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/ripple_hs/info.json
rename to keyboards/cannonkeys/ripple_hs/keyboard.json
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/sagittarius/info.json
rename to keyboards/cannonkeys/sagittarius/keyboard.json
diff --git a/keyboards/cannonkeys/satisfaction75_hs/info.json b/keyboards/cannonkeys/satisfaction75_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/satisfaction75_hs/info.json
rename to keyboards/cannonkeys/satisfaction75_hs/keyboard.json
diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/savage65/info.json
rename to keyboards/cannonkeys/savage65/keyboard.json
diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/serenity/info.json
rename to keyboards/cannonkeys/serenity/keyboard.json
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/tmov2/info.json
rename to keyboards/cannonkeys/tmov2/keyboard.json
diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/tsukuyomi/info.json
rename to keyboards/cannonkeys/tsukuyomi/keyboard.json
diff --git a/keyboards/cannonkeys/vector/info.json b/keyboards/cannonkeys/vector/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/vector/info.json
rename to keyboards/cannonkeys/vector/keyboard.json
diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/vicious40/info.json
rename to keyboards/cannonkeys/vicious40/keyboard.json
diff --git a/keyboards/cantor/info.json b/keyboards/cantor/keyboard.json
similarity index 100%
rename from keyboards/cantor/info.json
rename to keyboards/cantor/keyboard.json
diff --git a/keyboards/centromere/info.json b/keyboards/centromere/keyboard.json
similarity index 100%
rename from keyboards/centromere/info.json
rename to keyboards/centromere/keyboard.json
diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/keyboard.json
similarity index 100%
rename from keyboards/checkerboards/phoenix45_ortho/info.json
rename to keyboards/checkerboards/phoenix45_ortho/keyboard.json
diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/keyboard.json
similarity index 100%
rename from keyboards/checkerboards/quark/info.json
rename to keyboards/checkerboards/quark/keyboard.json
diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/keyboard.json
similarity index 100%
rename from keyboards/checkerboards/quark_squared/info.json
rename to keyboards/checkerboards/quark_squared/keyboard.json
diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_23u/info.json
rename to keyboards/cipulot/ec_23u/keyboard.json
diff --git a/keyboards/cipulot/ec_60/info.json b/keyboards/cipulot/ec_60/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_60/info.json
rename to keyboards/cipulot/ec_60/keyboard.json
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/info.json b/keyboards/cipulot/ec_alveus/1_0_0/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_alveus/1_0_0/info.json
rename to keyboards/cipulot/ec_alveus/1_0_0/keyboard.json
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/info.json b/keyboards/cipulot/ec_alveus/1_2_0/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_alveus/1_2_0/info.json
rename to keyboards/cipulot/ec_alveus/1_2_0/keyboard.json
diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_pro2/info.json
rename to keyboards/cipulot/ec_pro2/keyboard.json
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/info.json b/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_prox/ansi_iso/info.json
rename to keyboards/cipulot/ec_prox/ansi_iso/keyboard.json
diff --git a/keyboards/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_prox/jis/info.json
rename to keyboards/cipulot/ec_prox/jis/keyboard.json
diff --git a/keyboards/cipulot/ec_theca/info.json b/keyboards/cipulot/ec_theca/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_theca/info.json
rename to keyboards/cipulot/ec_theca/keyboard.json
diff --git a/keyboards/cipulot/ec_typek/info.json b/keyboards/cipulot/ec_typek/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_typek/info.json
rename to keyboards/cipulot/ec_typek/keyboard.json
diff --git a/keyboards/cipulot/mnk_60_ec/info.json b/keyboards/cipulot/mnk_60_ec/keyboard.json
similarity index 100%
rename from keyboards/cipulot/mnk_60_ec/info.json
rename to keyboards/cipulot/mnk_60_ec/keyboard.json
diff --git a/keyboards/cipulot/mnk_65_ec/info.json b/keyboards/cipulot/mnk_65_ec/keyboard.json
similarity index 100%
rename from keyboards/cipulot/mnk_65_ec/info.json
rename to keyboards/cipulot/mnk_65_ec/keyboard.json
diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/keyboard.json
similarity index 100%
rename from keyboards/cipulot/rf_r1_8_9xu/info.json
rename to keyboards/cipulot/rf_r1_8_9xu/keyboard.json
diff --git a/keyboards/clueboard/2x1800/2021/info.json b/keyboards/clueboard/2x1800/2021/keyboard.json
similarity index 100%
rename from keyboards/clueboard/2x1800/2021/info.json
rename to keyboards/clueboard/2x1800/2021/keyboard.json
diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/keyboard.json
similarity index 100%
rename from keyboards/clueboard/60/info.json
rename to keyboards/clueboard/60/keyboard.json
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/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/keyboard.json
similarity index 100%
rename from keyboards/controllerworks/city42/info.json
rename to keyboards/controllerworks/city42/keyboard.json
diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/keyboard.json
similarity index 100%
rename from keyboards/controllerworks/mini36/info.json
rename to keyboards/controllerworks/mini36/keyboard.json
diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/keyboard.json
similarity index 100%
rename from keyboards/controllerworks/mini42/info.json
rename to keyboards/controllerworks/mini42/keyboard.json
diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/keyboard.json
similarity index 100%
rename from keyboards/converter/hp_46010a/info.json
rename to keyboards/converter/hp_46010a/keyboard.json
diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/keyboard.json
similarity index 100%
rename from keyboards/converter/ibm_terminal/info.json
rename to keyboards/converter/ibm_terminal/keyboard.json
diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/keyboard.json
similarity index 100%
rename from keyboards/converter/m0110_usb/info.json
rename to keyboards/converter/m0110_usb/keyboard.json
diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/keyboard.json
similarity index 100%
rename from keyboards/converter/siemens_tastatur/info.json
rename to keyboards/converter/siemens_tastatur/keyboard.json
diff --git a/keyboards/converter/usb_usb/ble/info.json b/keyboards/converter/usb_usb/ble/info.json
deleted file mode 100644
index 18edf5f577c..00000000000
--- a/keyboards/converter/usb_usb/ble/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "bootloader": "caterina",
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    }
-}
diff --git a/keyboards/converter/usb_usb/ble/keyboard.json b/keyboards/converter/usb_usb/ble/keyboard.json
new file mode 100644
index 00000000000..b92bfe7f3e0
--- /dev/null
+++ b/keyboards/converter/usb_usb/ble/keyboard.json
@@ -0,0 +1,12 @@
+{
+    "bootloader": "caterina",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "build": {
+        "lto": true
+    },
+    "features":{
+        "bluetooth": true
+    }
+}
diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk
index 5b0435372b7..3437a35bdf1 100644
--- a/keyboards/converter/usb_usb/ble/rules.mk
+++ b/keyboards/converter/usb_usb/ble/rules.mk
@@ -1,6 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-EXTRAKEY_ENABLE = no
-BLUETOOTH_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/converter/usb_usb/pro_micro/info.json b/keyboards/converter/usb_usb/pro_micro/keyboard.json
similarity index 100%
rename from keyboards/converter/usb_usb/pro_micro/info.json
rename to keyboards/converter/usb_usb/pro_micro/keyboard.json
diff --git a/keyboards/converter/xmk/info.json b/keyboards/converter/xmk/keyboard.json
similarity index 100%
rename from keyboards/converter/xmk/info.json
rename to keyboards/converter/xmk/keyboard.json
diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/keyboard.json
similarity index 100%
rename from keyboards/converter/xt_usb/info.json
rename to keyboards/converter/xt_usb/keyboard.json
diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/keyboard.json
similarity index 100%
rename from keyboards/coseyfannitutti/discipline/info.json
rename to keyboards/coseyfannitutti/discipline/keyboard.json
diff --git a/keyboards/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/keyboard.json
similarity index 100%
rename from keyboards/coseyfannitutti/mysterium/info.json
rename to keyboards/coseyfannitutti/mysterium/keyboard.json
diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
deleted file mode 100644
index 7636d9b702f..00000000000
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "keyboard_name": "Speedo",
-  "manufacturer": "CozyKeys",
-  "url": "https://github.com/cozykeys/speedo",
-  "maintainer": "pcewing",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1192",
-    "device_version": "0.0.3"
-  },
-  "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": "B5"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2", "E6", "D7", "C6", "D4", "D0", "D1"],
-    "rows": ["F0", "F1", "C7", "D5", "B7"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "features": {
-    "bootmagic": false,
-    "mousekey": true,
-    "extrakey": true,
-    "rgblight": true
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0.695, "y": 0, "r": 10},
-        {"matrix": [0, 1], "x": 1.679, "y": 0.174, "r": 10},
-        {"matrix": [0, 2], "x": 2.692, "y": 0.192, "r": 10},
-        {"matrix": [0, 3], "x": 3.722, "y": 0.107, "r": 10},
-        {"matrix": [0, 4], "x": 4.652, "y": 0.591, "r": 10},
-        {"matrix": [0, 5], "x": 5.591, "y": 1.023, "r": 10},
-
-        {"matrix": [0, 8], "x": 9.457, "y": 1.023, "r": -10},
-        {"matrix": [0, 9], "x": 10.396, "y": 0.591, "r": -10},
-        {"matrix": [0, 10], "x": 11.326, "y": 0.107, "r": -10},
-        {"matrix": [0, 11], "x": 12.356, "y": 0.192, "r": -10},
-        {"matrix": [0, 12], "x": 13.369, "y": 0.174, "r": -10},
-        {"matrix": [0, 13], "x": 14.353, "y": 0, "r": -10},
-
-        {"matrix": [1, 0], "x": 0.521, "y": 0.985, "r": 10},
-        {"matrix": [1, 1], "x": 1.506, "y": 1.158, "r": 10},
-        {"matrix": [1, 2], "x": 2.518, "y": 1.177, "r": 10},
-        {"matrix": [1, 3], "x": 3.548, "y": 1.092, "r": 10},
-        {"matrix": [1, 4], "x": 4.478, "y": 1.576, "r": 10},
-        {"matrix": [1, 5], "x": 5.418, "y": 2.008, "r": 10},
-
-        {"matrix": [2, 7], "x": 7.524, "y": 3.305, "r": 0},
-
-        {"matrix": [1, 8], "x": 9.63, "y": 2.008, "r": -10},
-        {"matrix": [1, 9], "x": 10.57, "y": 1.576, "r": -10},
-        {"matrix": [1, 10], "x": 11.5, "y": 1.092, "r": -10},
-        {"matrix": [1, 11], "x": 12.53, "y": 1.177, "r": -10},
-        {"matrix": [1, 12], "x": 13.542, "y": 1.158, "r": -10},
-        {"matrix": [1, 13], "x": 14.527, "y": 0.985, "r": -10},
-
-        {"matrix": [2, 0], "x": 0.347, "y": 1.97, "r": 10},
-        {"matrix": [2, 1], "x": 1.332, "y": 2.143, "r": 10},
-        {"matrix": [2, 2], "x": 2.344, "y": 2.162, "r": 10},
-        {"matrix": [2, 3], "x": 3.375, "y": 2.077, "r": 10},
-        {"matrix": [2, 4], "x": 4.305, "y": 2.561, "r": 10},
-        {"matrix": [2, 5], "x": 5.244, "y": 2.993, "r": 10},
-
-        {"matrix": [2, 6], "x": 6.524, "y": 3.805, "r": 0},
-        {"matrix": [3, 7], "x": 8.524, "y": 3.805, "r": 0},
-
-        {"matrix": [2, 8], "x": 9.804, "y": 2.993, "r": -10},
-        {"matrix": [2, 9], "x": 10.743, "y": 2.561, "r": -10},
-        {"matrix": [2, 10], "x": 11.673, "y": 2.077, "r": -10},
-        {"matrix": [2, 11], "x": 12.704, "y": 2.162, "r": -10},
-        {"matrix": [2, 12], "x": 13.716, "y": 2.143, "r": -10},
-        {"matrix": [2, 13], "x": 14.701, "y": 1.97, "r": -10},
-
-        {"matrix": [3, 0], "x": 0.174, "y": 2.954, "r": 10},
-        {"matrix": [3, 1], "x": 1.158, "y": 3.128, "r": 10},
-        {"matrix": [3, 2], "x": 2.171, "y": 3.147, "r": 10},
-        {"matrix": [3, 3], "x": 3.201, "y": 3.062, "r": 10},
-        {"matrix": [3, 4], "x": 4.131, "y": 3.546, "r": 10},
-        {"matrix": [3, 5], "x": 5.07, "y": 3.978, "r": 10},
-
-        {"matrix": [3, 6], "x": 7.524, "y": 4.305, "r": 0},
-
-        {"matrix": [3, 8], "x": 9.978, "y": 3.978, "r": -10},
-        {"matrix": [3, 9], "x": 10.917, "y": 3.546, "r": -10},
-        {"matrix": [3, 10], "x": 11.847, "y": 3.062, "r": -10},
-        {"matrix": [3, 11], "x": 12.877, "y": 3.147, "r": -10},
-        {"matrix": [3, 12], "x": 13.89, "y": 3.128, "r": -10},
-        {"matrix": [3, 13], "x": 14.874, "y": 2.954, "r": -10},
-
-        {"matrix": [4, 0], "x": 0, "y": 3.939, "r": 10},
-        {"matrix": [4, 1], "x": 0.985, "y": 4.113, "r": 10},
-        {"matrix": [4, 2], "x": 1.997, "y": 4.131, "r": 10},
-        {"matrix": [4, 3], "x": 3.027, "y": 4.047, "r": 10},
-        {"matrix": [4, 4], "x": 3.957, "y": 4.53, "r": 10},
-        {"matrix": [4, 5], "x": 4.897, "y": 4.963, "r": 10},
-        {"matrix": [4, 6], "x": 5.881, "y": 5.136, "r": 10},
-
-        {"matrix": [4, 7], "x": 9.166, "y": 5.136, "r": -10},
-        {"matrix": [4, 8], "x": 10.151, "y": 4.963, "r": -10},
-        {"matrix": [4, 9], "x": 11.09, "y": 4.53, "r": -10},
-        {"matrix": [4, 10], "x": 12.021, "y": 4.047, "r": -10},
-        {"matrix": [4, 11], "x": 13.051, "y": 4.131, "r": -10},
-        {"matrix": [4, 12], "x": 14.063, "y": 4.113, "r": -10},
-        {"matrix": [4, 13], "x": 15.048, "y": 3.939, "r": -10}
-      ]
-    }
-  }
-}
diff --git a/keyboards/cozykeys/speedo/v3/keyboard.json b/keyboards/cozykeys/speedo/v3/keyboard.json
new file mode 100644
index 00000000000..c4aaaecb6d1
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/keyboard.json
@@ -0,0 +1,130 @@
+{
+  "keyboard_name": "Speedo",
+  "manufacturer": "CozyKeys",
+  "url": "https://github.com/cozykeys/speedo",
+  "maintainer": "pcewing",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1192",
+    "device_version": "0.0.3"
+  },
+  "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": "B5"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2", "E6", "D7", "C6", "D4", "D0", "D1"],
+    "rows": ["F0", "F1", "C7", "D5", "B7"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "pin_compatible": "elite_c",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0.695, "y": 0, "r": 10},
+        {"matrix": [0, 1], "x": 1.679, "y": 0.174, "r": 10},
+        {"matrix": [0, 2], "x": 2.692, "y": 0.192, "r": 10},
+        {"matrix": [0, 3], "x": 3.722, "y": 0.107, "r": 10},
+        {"matrix": [0, 4], "x": 4.652, "y": 0.591, "r": 10},
+        {"matrix": [0, 5], "x": 5.591, "y": 1.023, "r": 10},
+
+        {"matrix": [0, 8], "x": 9.457, "y": 1.023, "r": -10},
+        {"matrix": [0, 9], "x": 10.396, "y": 0.591, "r": -10},
+        {"matrix": [0, 10], "x": 11.326, "y": 0.107, "r": -10},
+        {"matrix": [0, 11], "x": 12.356, "y": 0.192, "r": -10},
+        {"matrix": [0, 12], "x": 13.369, "y": 0.174, "r": -10},
+        {"matrix": [0, 13], "x": 14.353, "y": 0, "r": -10},
+
+        {"matrix": [1, 0], "x": 0.521, "y": 0.985, "r": 10},
+        {"matrix": [1, 1], "x": 1.506, "y": 1.158, "r": 10},
+        {"matrix": [1, 2], "x": 2.518, "y": 1.177, "r": 10},
+        {"matrix": [1, 3], "x": 3.548, "y": 1.092, "r": 10},
+        {"matrix": [1, 4], "x": 4.478, "y": 1.576, "r": 10},
+        {"matrix": [1, 5], "x": 5.418, "y": 2.008, "r": 10},
+
+        {"matrix": [2, 7], "x": 7.524, "y": 3.305, "r": 0},
+
+        {"matrix": [1, 8], "x": 9.63, "y": 2.008, "r": -10},
+        {"matrix": [1, 9], "x": 10.57, "y": 1.576, "r": -10},
+        {"matrix": [1, 10], "x": 11.5, "y": 1.092, "r": -10},
+        {"matrix": [1, 11], "x": 12.53, "y": 1.177, "r": -10},
+        {"matrix": [1, 12], "x": 13.542, "y": 1.158, "r": -10},
+        {"matrix": [1, 13], "x": 14.527, "y": 0.985, "r": -10},
+
+        {"matrix": [2, 0], "x": 0.347, "y": 1.97, "r": 10},
+        {"matrix": [2, 1], "x": 1.332, "y": 2.143, "r": 10},
+        {"matrix": [2, 2], "x": 2.344, "y": 2.162, "r": 10},
+        {"matrix": [2, 3], "x": 3.375, "y": 2.077, "r": 10},
+        {"matrix": [2, 4], "x": 4.305, "y": 2.561, "r": 10},
+        {"matrix": [2, 5], "x": 5.244, "y": 2.993, "r": 10},
+
+        {"matrix": [2, 6], "x": 6.524, "y": 3.805, "r": 0},
+        {"matrix": [3, 7], "x": 8.524, "y": 3.805, "r": 0},
+
+        {"matrix": [2, 8], "x": 9.804, "y": 2.993, "r": -10},
+        {"matrix": [2, 9], "x": 10.743, "y": 2.561, "r": -10},
+        {"matrix": [2, 10], "x": 11.673, "y": 2.077, "r": -10},
+        {"matrix": [2, 11], "x": 12.704, "y": 2.162, "r": -10},
+        {"matrix": [2, 12], "x": 13.716, "y": 2.143, "r": -10},
+        {"matrix": [2, 13], "x": 14.701, "y": 1.97, "r": -10},
+
+        {"matrix": [3, 0], "x": 0.174, "y": 2.954, "r": 10},
+        {"matrix": [3, 1], "x": 1.158, "y": 3.128, "r": 10},
+        {"matrix": [3, 2], "x": 2.171, "y": 3.147, "r": 10},
+        {"matrix": [3, 3], "x": 3.201, "y": 3.062, "r": 10},
+        {"matrix": [3, 4], "x": 4.131, "y": 3.546, "r": 10},
+        {"matrix": [3, 5], "x": 5.07, "y": 3.978, "r": 10},
+
+        {"matrix": [3, 6], "x": 7.524, "y": 4.305, "r": 0},
+
+        {"matrix": [3, 8], "x": 9.978, "y": 3.978, "r": -10},
+        {"matrix": [3, 9], "x": 10.917, "y": 3.546, "r": -10},
+        {"matrix": [3, 10], "x": 11.847, "y": 3.062, "r": -10},
+        {"matrix": [3, 11], "x": 12.877, "y": 3.147, "r": -10},
+        {"matrix": [3, 12], "x": 13.89, "y": 3.128, "r": -10},
+        {"matrix": [3, 13], "x": 14.874, "y": 2.954, "r": -10},
+
+        {"matrix": [4, 0], "x": 0, "y": 3.939, "r": 10},
+        {"matrix": [4, 1], "x": 0.985, "y": 4.113, "r": 10},
+        {"matrix": [4, 2], "x": 1.997, "y": 4.131, "r": 10},
+        {"matrix": [4, 3], "x": 3.027, "y": 4.047, "r": 10},
+        {"matrix": [4, 4], "x": 3.957, "y": 4.53, "r": 10},
+        {"matrix": [4, 5], "x": 4.897, "y": 4.963, "r": 10},
+        {"matrix": [4, 6], "x": 5.881, "y": 5.136, "r": 10},
+
+        {"matrix": [4, 7], "x": 9.166, "y": 5.136, "r": -10},
+        {"matrix": [4, 8], "x": 10.151, "y": 4.963, "r": -10},
+        {"matrix": [4, 9], "x": 11.09, "y": 4.53, "r": -10},
+        {"matrix": [4, 10], "x": 12.021, "y": 4.047, "r": -10},
+        {"matrix": [4, 11], "x": 13.051, "y": 4.131, "r": -10},
+        {"matrix": [4, 12], "x": 14.063, "y": 4.113, "r": -10},
+        {"matrix": [4, 13], "x": 15.048, "y": 3.939, "r": -10}
+      ]
+    }
+  }
+}
diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk
deleted file mode 100644
index baf23318ccd..00000000000
--- a/keyboards/cozykeys/speedo/v3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-PIN_COMPATIBLE = elite_c
diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/keyboard.json
similarity index 100%
rename from keyboards/crimsonkeyboards/resume1800/info.json
rename to keyboards/crimsonkeyboards/resume1800/keyboard.json
diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk
index a63f102097f..836587e45e6 100644
--- a/keyboards/crkbd/rules.mk
+++ b/keyboards/crkbd/rules.mk
@@ -1,8 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-
 DEFAULT_FOLDER = crkbd/rev1
-
-RGBLIGHT_SUPPORTED = yes
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/keyboard.json
similarity index 100%
rename from keyboards/crypt_macro/info.json
rename to keyboards/crypt_macro/keyboard.json
diff --git a/keyboards/custommk/cmk11/info.json b/keyboards/custommk/cmk11/keyboard.json
similarity index 100%
rename from keyboards/custommk/cmk11/info.json
rename to keyboards/custommk/cmk11/keyboard.json
diff --git a/keyboards/custommk/ergostrafer/info.json b/keyboards/custommk/ergostrafer/keyboard.json
similarity index 100%
rename from keyboards/custommk/ergostrafer/info.json
rename to keyboards/custommk/ergostrafer/keyboard.json
diff --git a/keyboards/custommk/evo70_r2/info.json b/keyboards/custommk/evo70_r2/keyboard.json
similarity index 100%
rename from keyboards/custommk/evo70_r2/info.json
rename to keyboards/custommk/evo70_r2/keyboard.json
diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json
deleted file mode 100644
index b3caa8ad13e..00000000000
--- a/keyboards/dailycraft/claw44/rev1/info.json
+++ /dev/null
@@ -1,80 +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": {
-        "enabled": true,
-        "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 7e2ee0ceacb..00000000000
--- a/keyboards/dailycraft/claw44/rev1/rules.mk
+++ /dev/null
@@ -1,13 +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
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 5d7255ff67e..00000000000
--- a/keyboards/dailycraft/sandbox/rev2/info.json
+++ /dev/null
@@ -1,51 +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": {
-        "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": [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 3bbd2614291..00000000000
--- a/keyboards/dailycraft/sandbox/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
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/info.json b/keyboards/dailycraft/wings42/info.json
deleted file mode 100644
index 2b9790e84e6..00000000000
--- a/keyboards/dailycraft/wings42/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "split": {
-        "enabled": true
-    }
-}
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 f69adcecec0..b027fec9b97 100644
--- a/keyboards/dailycraft/wings42/rules.mk
+++ b/keyboards/dailycraft/wings42/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 = dailycraft/wings42/rev2
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/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 da8a2124e8f..ee888337e5e 100644
--- a/keyboards/deltasplit75/rules.mk
+++ b/keyboards/deltasplit75/rules.mk
@@ -1,14 +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
-
 DEFAULT_FOLDER = deltasplit75/v2
diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json
deleted file mode 100644
index 8372650df5d..00000000000
--- a/keyboards/deltasplit75/v2/info.json
+++ /dev/null
@@ -1,231 +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": {
-      "enabled": true,
-      "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 a78ecef2114..00000000000
--- a/keyboards/dm9records/ergoinu/info.json
+++ /dev/null
@@ -1,108 +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": {
-    "enabled": true,
-    "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 951dd07d6e0..00000000000
--- a/keyboards/dm9records/ergoinu/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 = 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/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/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 a1775a2b107..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": "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/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 e9f3aba7157..00000000000
--- a/keyboards/doppelganger/info.json
+++ /dev/null
@@ -1,144 +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": {
-        "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",
-    "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 3414d97c204..00000000000
--- a/keyboards/doppelganger/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 = 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/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 ec36a725c34..00000000000
--- a/keyboards/dp60/info.json
+++ /dev/null
@@ -1,564 +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_hhkb", "60_iso", "60_ansi_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": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "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, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"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": [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_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_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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dp60/keyboard.json b/keyboards/dp60/keyboard.json
new file mode 100644
index 00000000000..c9b3b6fddef
--- /dev/null
+++ b/keyboards/dp60/keyboard.json
@@ -0,0 +1,571 @@
+{
+    "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_hhkb", "60_iso", "60_ansi_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": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "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, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"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": [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_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_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}
+            ]
+        }
+    }
+}
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 1635b8bd2c1..00000000000
--- a/keyboards/draculad/info.json
+++ /dev/null
@@ -1,105 +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": {
-        "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",
-    "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 130d29fb1de..00000000000
--- a/keyboards/draculad/rules.mk
+++ /dev/null
@@ -1,16 +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
-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/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json
deleted file mode 100644
index c2acc3b0d95..00000000000
--- a/keyboards/duck/eagle_viper/v2/info.json
+++ /dev/null
@@ -1,396 +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_hhkb", "60_ansi_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_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_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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/duck/eagle_viper/v2/keyboard.json b/keyboards/duck/eagle_viper/v2/keyboard.json
new file mode 100644
index 00000000000..9c16c48db3e
--- /dev/null
+++ b/keyboards/duck/eagle_viper/v2/keyboard.json
@@ -0,0 +1,405 @@
+{
+    "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_hhkb", "60_ansi_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_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_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}
+            ]
+        }
+    }
+}
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/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/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 4eb7c4941ed..00000000000
--- a/keyboards/ducky/one2mini/1861st/info.json
+++ /dev/null
@@ -1,233 +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"
-    },
-    "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..a39945d68c2
--- /dev/null
+++ b/keyboards/ducky/one2mini/1861st/keyboard.json
@@ -0,0 +1,240 @@
+{
+    "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"
+    },
+    "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 ddcab98dd32..00000000000
--- a/keyboards/dumbo/info.json
+++ /dev/null
@@ -1,93 +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": {
-        "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",
-    "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 a64aa6f849b..00000000000
--- a/keyboards/dumbo/rules.mk
+++ /dev/null
@@ -1,12 +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
-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/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/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/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 ea646d3d939..00000000000
--- a/keyboards/dztech/dz60rgb/v1/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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
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 ea646d3d939..00000000000
--- a/keyboards/dztech/dz60rgb/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
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
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 5c51de83766..13252d81696 100644
--- a/keyboards/dztech/dz60rgb/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb/v2_1/rules.mk
@@ -1,19 +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
-
-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 ea646d3d939..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v1/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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
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 f478792adbc..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/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 = 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_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 ea646d3d939..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v1/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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
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 ea646d3d939..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/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
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
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/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 eb53fda96d8..00000000000
--- a/keyboards/elephant42/info.json
+++ /dev/null
@@ -1,112 +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": {
-        "enabled": true,
-        "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 9091c741718..00000000000
--- a/keyboards/elephant42/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 = 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
-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/info.json b/keyboards/era/linx3/n86/keyboard.json
similarity index 100%
rename from keyboards/era/linx3/n86/info.json
rename to keyboards/era/linx3/n86/keyboard.json
diff --git a/keyboards/era/linx3/n86/rules.mk b/keyboards/era/linx3/n86/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/era/linx3/n86/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/info.json b/keyboards/era/linx3/n8x/keyboard.json
similarity index 100%
rename from keyboards/era/linx3/n8x/info.json
rename to keyboards/era/linx3/n8x/keyboard.json
diff --git a/keyboards/era/linx3/n8x/rules.mk b/keyboards/era/linx3/n8x/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/era/linx3/n8x/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ 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 82e4b41b6df..ef40c1d960d 100644
--- a/keyboards/ergoslab/rev1/keyboard.json
+++ b/keyboards/ergoslab/rev1/keyboard.json
@@ -25,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 5255b41b06f..8eb40c77d5a 100644
--- a/keyboards/ergoslab/rules.mk
+++ b/keyboards/ergoslab/rules.mk
@@ -1,14 +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.
-
 DEFAULT_FOLDER = ergoslab/rev1
diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json
deleted file mode 100644
index 43d3d01a925..00000000000
--- a/keyboards/ergotravel/rev1/info.json
+++ /dev/null
@@ -1,95 +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": {
-    "enabled": true,
-    "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 f52203f7059..3f30277bb56 100644
--- a/keyboards/ergotravel/rules.mk
+++ b/keyboards/ergotravel/rules.mk
@@ -1,14 +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. 
-
 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_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/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/info.json b/keyboards/fallacy/info.json
deleted file mode 100644
index 9489463a4cd..00000000000
--- a/keyboards/fallacy/info.json
+++ /dev/null
@@ -1,203 +0,0 @@
-{
-    "keyboard_name": "Fallacy",
-    "manufacturer": "SheuBox",
-    "maintainer": "Toraifu",
-    "usb": {
-        "vid": "0xBF00",
-        "pid": "0xBFFA",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
-        "rows": ["B1", "B2", "B3", "C6", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 14,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["alice", "alice_split_bs"],
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs",
-        "LAYOUT_default": "LAYOUT_alice"
-    },
-    "layouts": {
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-                {"matrix": [0, 5], "x": 6.75, "y": 0},
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 10, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-                {"matrix": [0, 12], "x": 15, "y": 0},
-                {"matrix": [0, 13], "x": 16, "y": 0},
-                {"matrix": [0, 14], "x": 17, "y": 0},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 7], "x": 10.25, "y": 2},
-                {"matrix": [2, 8], "x": 11.25, "y": 2},
-                {"matrix": [2, 9], "x": 12.25, "y": 2},
-                {"matrix": [2, 10], "x": 13.25, "y": 2},
-                {"matrix": [2, 11], "x": 14.25, "y": 2},
-                {"matrix": [2, 12], "x": 15.25, "y": 2},
-                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-
-                {"matrix": [3, 7], "x": 10, "y": 3},
-                {"matrix": [3, 8], "x": 11, "y": 3},
-                {"matrix": [3, 9], "x": 12, "y": 3},
-                {"matrix": [3, 10], "x": 13, "y": 3},
-                {"matrix": [3, 11], "x": 14, "y": 3},
-                {"matrix": [3, 12], "x": 15, "y": 3},
-                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.75, "y": 3},
-
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 7.75, "y": 4},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-                {"matrix": [0, 5], "x": 6.75, "y": 0},
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 10, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-                {"matrix": [0, 12], "x": 15, "y": 0},
-                {"matrix": [0, 14], "x": 16, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 7], "x": 10.25, "y": 2},
-                {"matrix": [2, 8], "x": 11.25, "y": 2},
-                {"matrix": [2, 9], "x": 12.25, "y": 2},
-                {"matrix": [2, 10], "x": 13.25, "y": 2},
-                {"matrix": [2, 11], "x": 14.25, "y": 2},
-                {"matrix": [2, 12], "x": 15.25, "y": 2},
-                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-
-                {"matrix": [3, 7], "x": 10, "y": 3},
-                {"matrix": [3, 8], "x": 11, "y": 3},
-                {"matrix": [3, 9], "x": 12, "y": 3},
-                {"matrix": [3, 10], "x": 13, "y": 3},
-                {"matrix": [3, 11], "x": 14, "y": 3},
-                {"matrix": [3, 12], "x": 15, "y": 3},
-                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.75, "y": 3},
-
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 7.75, "y": 4},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fallacy/keyboard.json b/keyboards/fallacy/keyboard.json
new file mode 100644
index 00000000000..fbeca239d9f
--- /dev/null
+++ b/keyboards/fallacy/keyboard.json
@@ -0,0 +1,211 @@
+{
+    "keyboard_name": "Fallacy",
+    "manufacturer": "SheuBox",
+    "maintainer": "Toraifu",
+    "usb": {
+        "vid": "0xBF00",
+        "pid": "0xBFFA",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs",
+        "LAYOUT_default": "LAYOUT_alice"
+    },
+    "layouts": {
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 17, "y": 0},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3},
+                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3},
+                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/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
deleted file mode 100644
index e65ed35dae7..00000000000
--- a/keyboards/fc660c/info.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "keyboard_name": "FC660C",
-    "manufacturer": "Hasu",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4853",
-        "pid": "0x660C",
-        "device_version": "1.0.0"
-    },
-    "tapping": {
-        "term": 175
-    },
-    "indicators": {
-        "caps_lock": "B6",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 0,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [1, 3], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [1, 1], "x": 2, "y": 0},
-                {"matrix": [1, 2], "x": 3, "y": 0},
-                {"matrix": [1, 4], "x": 4, "y": 0},
-                {"matrix": [1, 6], "x": 5, "y": 0},
-                {"matrix": [1, 7], "x": 6, "y": 0},
-                {"matrix": [1, 5], "x": 7, "y": 0},
-                {"matrix": [1, 11], "x": 8, "y": 0},
-                {"matrix": [1, 8], "x": 9, "y": 0},
-                {"matrix": [1, 9], "x": 10, "y": 0},
-                {"matrix": [1, 10], "x": 11, "y": 0},
-                {"matrix": [1, 12], "x": 12, "y": 0},
-                {"matrix": [1, 14], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 15], "x": 15.5, "y": 0},
-
-                {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [0, 0], "x": 1.5, "y": 1},
-                {"matrix": [0, 1], "x": 2.5, "y": 1},
-                {"matrix": [0, 2], "x": 3.5, "y": 1},
-                {"matrix": [0, 4], "x": 4.5, "y": 1},
-                {"matrix": [0, 6], "x": 5.5, "y": 1},
-                {"matrix": [0, 7], "x": 6.5, "y": 1},
-                {"matrix": [0, 5], "x": 7.5, "y": 1},
-                {"matrix": [0, 11], "x": 8.5, "y": 1},
-                {"matrix": [0, 8], "x": 9.5, "y": 1},
-                {"matrix": [0, 9], "x": 10.5, "y": 1},
-                {"matrix": [0, 10], "x": 11.5, "y": 1},
-                {"matrix": [0, 12], "x": 12.5, "y": 1},
-                {"matrix": [0, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [0, 15], "x": 15.5, "y": 1},
-
-                {"matrix": [4, 3], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 0], "x": 1.75, "y": 2},
-                {"matrix": [4, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [4, 4], "x": 4.75, "y": 2},
-                {"matrix": [4, 6], "x": 5.75, "y": 2},
-                {"matrix": [4, 7], "x": 6.75, "y": 2},
-                {"matrix": [4, 5], "x": 7.75, "y": 2},
-                {"matrix": [4, 11], "x": 8.75, "y": 2},
-                {"matrix": [4, 8], "x": 9.75, "y": 2},
-                {"matrix": [4, 9], "x": 10.75, "y": 2},
-                {"matrix": [4, 10], "x": 11.75, "y": 2},
-                {"matrix": [4, 14], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 5], "x": 7.25, "y": 3},
-                {"matrix": [3, 11], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 13], "x": 14.5, "y": 3},
-
-                {"matrix": [2, 3], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [2, 7], "x": 3.75, "y": 4, "w": 6},
-                {"matrix": [2, 8], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [2, 10], "x": 11, "y": 4, "w": 1.25},
-                {"matrix": [2, 12], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [2, 14], "x": 13.5, "y": 4},
-                {"matrix": [2, 13], "x": 14.5, "y": 4},
-                {"matrix": [2, 15], "x": 15.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fc660c/keyboard.json b/keyboards/fc660c/keyboard.json
new file mode 100644
index 00000000000..6c573fef88b
--- /dev/null
+++ b/keyboards/fc660c/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "FC660C",
+    "manufacturer": "Hasu",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4853",
+        "pid": "0x660C",
+        "device_version": "1.0.0"
+    },
+    "tapping": {
+        "term": 175
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
+    "debounce": 0,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [1, 3], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [1, 2], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [1, 6], "x": 5, "y": 0},
+                {"matrix": [1, 7], "x": 6, "y": 0},
+                {"matrix": [1, 5], "x": 7, "y": 0},
+                {"matrix": [1, 11], "x": 8, "y": 0},
+                {"matrix": [1, 8], "x": 9, "y": 0},
+                {"matrix": [1, 9], "x": 10, "y": 0},
+                {"matrix": [1, 10], "x": 11, "y": 0},
+                {"matrix": [1, 12], "x": 12, "y": 0},
+                {"matrix": [1, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [0, 0], "x": 1.5, "y": 1},
+                {"matrix": [0, 1], "x": 2.5, "y": 1},
+                {"matrix": [0, 2], "x": 3.5, "y": 1},
+                {"matrix": [0, 4], "x": 4.5, "y": 1},
+                {"matrix": [0, 6], "x": 5.5, "y": 1},
+                {"matrix": [0, 7], "x": 6.5, "y": 1},
+                {"matrix": [0, 5], "x": 7.5, "y": 1},
+                {"matrix": [0, 11], "x": 8.5, "y": 1},
+                {"matrix": [0, 8], "x": 9.5, "y": 1},
+                {"matrix": [0, 9], "x": 10.5, "y": 1},
+                {"matrix": [0, 10], "x": 11.5, "y": 1},
+                {"matrix": [0, 12], "x": 12.5, "y": 1},
+                {"matrix": [0, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 1},
+
+                {"matrix": [4, 3], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [4, 4], "x": 4.75, "y": 2},
+                {"matrix": [4, 6], "x": 5.75, "y": 2},
+                {"matrix": [4, 7], "x": 6.75, "y": 2},
+                {"matrix": [4, 5], "x": 7.75, "y": 2},
+                {"matrix": [4, 11], "x": 8.75, "y": 2},
+                {"matrix": [4, 8], "x": 9.75, "y": 2},
+                {"matrix": [4, 9], "x": 10.75, "y": 2},
+                {"matrix": [4, 10], "x": 11.75, "y": 2},
+                {"matrix": [4, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 7.25, "y": 3},
+                {"matrix": [3, 11], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+                {"matrix": [2, 3], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [2, 7], "x": 3.75, "y": 4, "w": 6},
+                {"matrix": [2, 8], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [2, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [2, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 4},
+                {"matrix": [2, 13], "x": 14.5, "y": 4},
+                {"matrix": [2, 15], "x": 15.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/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
deleted file mode 100644
index 5060885c695..00000000000
--- a/keyboards/fc980c/info.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-  "keyboard_name": "FC980C",
-  "manufacturer": "Hasu",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4853",
-    "pid": "0x980C",
-    "device_version": "1.0.0"
-  },
-  "dynamic_keymap": {
-    "layer_count": 3
-  },
-  "indicators": {
-    "caps_lock": "B5",
-    "num_lock": "B4",
-    "scroll_lock": "B6"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "debounce": 0,
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 13], "x": 0, "y": 0},
-
-        {"matrix": [2, 13], "x": 2, "y": 0},
-        {"matrix": [5, 13], "x": 3, "y": 0},
-        {"matrix": [3, 13], "x": 4, "y": 0},
-        {"matrix": [6, 13], "x": 5, "y": 0},
-
-        {"matrix": [7, 13], "x": 6.5, "y": 0},
-        {"matrix": [7, 15], "x": 7.5, "y": 0},
-        {"matrix": [7, 14], "x": 8.5, "y": 0},
-        {"matrix": [7, 12], "x": 9.5, "y": 0},
-
-        {"matrix": [7, 2], "x": 11, "y": 0},
-        {"matrix": [7, 1], "x": 12, "y": 0},
-        {"matrix": [7, 0], "x": 13, "y": 0},
-        {"matrix": [7, 3], "x": 14, "y": 0},
-
-        {"matrix": [7, 4], "x": 15.5, "y": 0},
-        {"matrix": [7, 6], "x": 16.5, "y": 0},
-        {"matrix": [7, 7], "x": 17.5, "y": 0},
-        {"matrix": [7, 5], "x": 18.5, "y": 0},
-
-        {"matrix": [0, 10], "x": 0, "y": 1.5},
-        {"matrix": [6, 9], "x": 1, "y": 1.5},
-        {"matrix": [5, 9], "x": 2, "y": 1.5},
-        {"matrix": [5, 8], "x": 3, "y": 1.5},
-        {"matrix": [5, 11], "x": 4, "y": 1.5},
-        {"matrix": [6, 15], "x": 5, "y": 1.5},
-        {"matrix": [5, 15], "x": 6, "y": 1.5},
-        {"matrix": [5, 14], "x": 7, "y": 1.5},
-        {"matrix": [6, 12], "x": 8, "y": 1.5},
-        {"matrix": [5, 12], "x": 9, "y": 1.5},
-        {"matrix": [5, 2], "x": 10, "y": 1.5},
-        {"matrix": [5, 1], "x": 11, "y": 1.5},
-        {"matrix": [5, 0], "x": 12, "y": 1.5},
-        {"matrix": [5, 5], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [5, 4], "x": 15.5, "y": 1.5},
-        {"matrix": [5, 6], "x": 16.5, "y": 1.5},
-        {"matrix": [5, 7], "x": 17.5, "y": 1.5},
-        {"matrix": [6, 5], "x": 18.5, "y": 1.5},
-
-        {"matrix": [6, 10], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [3, 9], "x": 1.5, "y": 2.5},
-        {"matrix": [6, 8], "x": 2.5, "y": 2.5},
-        {"matrix": [6, 11], "x": 3.5, "y": 2.5},
-        {"matrix": [3, 11], "x": 4.5, "y": 2.5},
-        {"matrix": [3, 15], "x": 5.5, "y": 2.5},
-        {"matrix": [6, 14], "x": 6.5, "y": 2.5},
-        {"matrix": [3, 14], "x": 7.5, "y": 2.5},
-        {"matrix": [3, 12], "x": 8.5, "y": 2.5},
-        {"matrix": [6, 2], "x": 9.5, "y": 2.5},
-        {"matrix": [6, 1], "x": 10.5, "y": 2.5},
-        {"matrix": [6, 0], "x": 11.5, "y": 2.5},
-        {"matrix": [3, 3], "x": 12.5, "y": 2.5},
-        {"matrix": [5, 3], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [6, 4], "x": 15.5, "y": 2.5},
-        {"matrix": [6, 6], "x": 16.5, "y": 2.5},
-        {"matrix": [6, 7], "x": 17.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 18.5, "y": 2.5, "h": 2},
-
-        {"matrix": [3, 10], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [2, 9], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-        {"matrix": [2, 8], "x": 3.75, "y": 3.5},
-        {"matrix": [2, 11], "x": 4.75, "y": 3.5},
-        {"matrix": [2, 15], "x": 5.75, "y": 3.5},
-        {"matrix": [2, 14], "x": 6.75, "y": 3.5},
-        {"matrix": [2, 12], "x": 7.75, "y": 3.5},
-        {"matrix": [1, 12], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 2], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 1], "x": 10.75, "y": 3.5},
-        {"matrix": [2, 0], "x": 11.75, "y": 3.5},
-        {"matrix": [6, 3], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [2, 4], "x": 15.5, "y": 3.5},
-        {"matrix": [2, 6], "x": 16.5, "y": 3.5},
-        {"matrix": [2, 7], "x": 17.5, "y": 3.5},
-
-        {"matrix": [2, 10], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [1, 8], "x": 2.25, "y": 4.5},
-        {"matrix": [0, 8], "x": 3.25, "y": 4.5},
-        {"matrix": [1, 11], "x": 4.25, "y": 4.5},
-        {"matrix": [0, 11], "x": 5.25, "y": 4.5},
-        {"matrix": [1, 15], "x": 6.25, "y": 4.5},
-        {"matrix": [1, 14], "x": 7.25, "y": 4.5},
-        {"matrix": [0, 14], "x": 8.25, "y": 4.5},
-        {"matrix": [2, 2], "x": 9.25, "y": 4.5},
-        {"matrix": [1, 1], "x": 10.25, "y": 4.5},
-        {"matrix": [2, 1], "x": 11.25, "y": 4.5},
-        {"matrix": [3, 0], "x": 12.25, "y": 4.5, "w": 1.75},
-
-        {"matrix": [3, 4], "x": 14.25, "y": 4.75},
-
-        {"matrix": [1, 4], "x": 15.5, "y": 4.5},
-        {"matrix": [1, 6], "x": 16.5, "y": 4.5},
-        {"matrix": [1, 7], "x": 17.5, "y": 4.5},
-        {"matrix": [1, 5], "x": 18.5, "y": 4.5, "h": 2},
-
-        {"matrix": [1, 10], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 9], "x": 1.25, "y": 5.5},
-        {"matrix": [1, 9], "x": 2.25, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 15], "x": 3.5, "y": 5.5, "w": 6},
-        {"matrix": [0, 2], "x": 9.5, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 1], "x": 10.75, "y": 5.5},
-        {"matrix": [1, 0], "x": 11.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [0, 0], "x": 13.25, "y": 5.75},
-        {"matrix": [0, 4], "x": 14.25, "y": 5.75},
-        {"matrix": [0, 6], "x": 15.25, "y": 5.75},
-
-        {"matrix": [0, 7], "x": 16.5, "y": 5.5},
-        {"matrix": [0, 5], "x": 17.5, "y": 5.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/fc980c/keyboard.json b/keyboards/fc980c/keyboard.json
new file mode 100644
index 00000000000..9944dd3899d
--- /dev/null
+++ b/keyboards/fc980c/keyboard.json
@@ -0,0 +1,150 @@
+{
+  "keyboard_name": "FC980C",
+  "manufacturer": "Hasu",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4853",
+    "pid": "0x980C",
+    "device_version": "1.0.0"
+  },
+  "dynamic_keymap": {
+    "layer_count": 3
+  },
+  "indicators": {
+    "caps_lock": "B5",
+    "num_lock": "B4",
+    "scroll_lock": "B6"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "debounce": 0,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 13], "x": 0, "y": 0},
+
+        {"matrix": [2, 13], "x": 2, "y": 0},
+        {"matrix": [5, 13], "x": 3, "y": 0},
+        {"matrix": [3, 13], "x": 4, "y": 0},
+        {"matrix": [6, 13], "x": 5, "y": 0},
+
+        {"matrix": [7, 13], "x": 6.5, "y": 0},
+        {"matrix": [7, 15], "x": 7.5, "y": 0},
+        {"matrix": [7, 14], "x": 8.5, "y": 0},
+        {"matrix": [7, 12], "x": 9.5, "y": 0},
+
+        {"matrix": [7, 2], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [7, 0], "x": 13, "y": 0},
+        {"matrix": [7, 3], "x": 14, "y": 0},
+
+        {"matrix": [7, 4], "x": 15.5, "y": 0},
+        {"matrix": [7, 6], "x": 16.5, "y": 0},
+        {"matrix": [7, 7], "x": 17.5, "y": 0},
+        {"matrix": [7, 5], "x": 18.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 0, "y": 1.5},
+        {"matrix": [6, 9], "x": 1, "y": 1.5},
+        {"matrix": [5, 9], "x": 2, "y": 1.5},
+        {"matrix": [5, 8], "x": 3, "y": 1.5},
+        {"matrix": [5, 11], "x": 4, "y": 1.5},
+        {"matrix": [6, 15], "x": 5, "y": 1.5},
+        {"matrix": [5, 15], "x": 6, "y": 1.5},
+        {"matrix": [5, 14], "x": 7, "y": 1.5},
+        {"matrix": [6, 12], "x": 8, "y": 1.5},
+        {"matrix": [5, 12], "x": 9, "y": 1.5},
+        {"matrix": [5, 2], "x": 10, "y": 1.5},
+        {"matrix": [5, 1], "x": 11, "y": 1.5},
+        {"matrix": [5, 0], "x": 12, "y": 1.5},
+        {"matrix": [5, 5], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [5, 4], "x": 15.5, "y": 1.5},
+        {"matrix": [5, 6], "x": 16.5, "y": 1.5},
+        {"matrix": [5, 7], "x": 17.5, "y": 1.5},
+        {"matrix": [6, 5], "x": 18.5, "y": 1.5},
+
+        {"matrix": [6, 10], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [3, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [6, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [6, 11], "x": 3.5, "y": 2.5},
+        {"matrix": [3, 11], "x": 4.5, "y": 2.5},
+        {"matrix": [3, 15], "x": 5.5, "y": 2.5},
+        {"matrix": [6, 14], "x": 6.5, "y": 2.5},
+        {"matrix": [3, 14], "x": 7.5, "y": 2.5},
+        {"matrix": [3, 12], "x": 8.5, "y": 2.5},
+        {"matrix": [6, 2], "x": 9.5, "y": 2.5},
+        {"matrix": [6, 1], "x": 10.5, "y": 2.5},
+        {"matrix": [6, 0], "x": 11.5, "y": 2.5},
+        {"matrix": [3, 3], "x": 12.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [6, 4], "x": 15.5, "y": 2.5},
+        {"matrix": [6, 6], "x": 16.5, "y": 2.5},
+        {"matrix": [6, 7], "x": 17.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 18.5, "y": 2.5, "h": 2},
+
+        {"matrix": [3, 10], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [2, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [2, 8], "x": 3.75, "y": 3.5},
+        {"matrix": [2, 11], "x": 4.75, "y": 3.5},
+        {"matrix": [2, 15], "x": 5.75, "y": 3.5},
+        {"matrix": [2, 14], "x": 6.75, "y": 3.5},
+        {"matrix": [2, 12], "x": 7.75, "y": 3.5},
+        {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 1], "x": 10.75, "y": 3.5},
+        {"matrix": [2, 0], "x": 11.75, "y": 3.5},
+        {"matrix": [6, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 4], "x": 15.5, "y": 3.5},
+        {"matrix": [2, 6], "x": 16.5, "y": 3.5},
+        {"matrix": [2, 7], "x": 17.5, "y": 3.5},
+
+        {"matrix": [2, 10], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 8], "x": 2.25, "y": 4.5},
+        {"matrix": [0, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 11], "x": 4.25, "y": 4.5},
+        {"matrix": [0, 11], "x": 5.25, "y": 4.5},
+        {"matrix": [1, 15], "x": 6.25, "y": 4.5},
+        {"matrix": [1, 14], "x": 7.25, "y": 4.5},
+        {"matrix": [0, 14], "x": 8.25, "y": 4.5},
+        {"matrix": [2, 2], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 1], "x": 10.25, "y": 4.5},
+        {"matrix": [2, 1], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 0], "x": 12.25, "y": 4.5, "w": 1.75},
+
+        {"matrix": [3, 4], "x": 14.25, "y": 4.75},
+
+        {"matrix": [1, 4], "x": 15.5, "y": 4.5},
+        {"matrix": [1, 6], "x": 16.5, "y": 4.5},
+        {"matrix": [1, 7], "x": 17.5, "y": 4.5},
+        {"matrix": [1, 5], "x": 18.5, "y": 4.5, "h": 2},
+
+        {"matrix": [1, 10], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 9], "x": 1.25, "y": 5.5},
+        {"matrix": [1, 9], "x": 2.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 15], "x": 3.5, "y": 5.5, "w": 6},
+        {"matrix": [0, 2], "x": 9.5, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 1], "x": 10.75, "y": 5.5},
+        {"matrix": [1, 0], "x": 11.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 0], "x": 13.25, "y": 5.75},
+        {"matrix": [0, 4], "x": 14.25, "y": 5.75},
+        {"matrix": [0, 6], "x": 15.25, "y": 5.75},
+
+        {"matrix": [0, 7], "x": 16.5, "y": 5.5},
+        {"matrix": [0, 5], "x": 17.5, "y": 5.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/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/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json
deleted file mode 100644
index 5a65369f61c..00000000000
--- a/keyboards/ferris/0_1/info.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "keyboard_name": "Ferris the keeb",
-    "manufacturer": "Pierre",
-    "usb": {
-        "vid": "0xC2AB",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["split_3x5_2"],
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_split_3x5_2"
-    },
-    "layouts": {
-        "LAYOUT_split_3x5_2": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.93},
-                {"matrix": [0, 1], "x": 1, "y": 0.31},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.28},
-                {"matrix": [0, 4], "x": 4, "y": 0.42},
-
-                {"matrix": [4, 0], "x": 7, "y": 0.42},
-                {"matrix": [4, 1], "x": 8, "y": 0.28},
-                {"matrix": [4, 2], "x": 9, "y": 0},
-                {"matrix": [4, 3], "x": 10, "y": 0.31},
-                {"matrix": [4, 4], "x": 11, "y": 0.93},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.93},
-                {"matrix": [1, 1], "x": 1, "y": 1.31},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.28},
-                {"matrix": [1, 4], "x": 4, "y": 1.42},
-
-                {"matrix": [5, 0], "x": 7, "y": 1.42},
-                {"matrix": [5, 1], "x": 8, "y": 1.28},
-                {"matrix": [5, 2], "x": 9, "y": 1},
-                {"matrix": [5, 3], "x": 10, "y": 1.31},
-                {"matrix": [5, 4], "x": 11, "y": 1.93},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.93},
-                {"matrix": [2, 1], "x": 1, "y": 2.31},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.28},
-                {"matrix": [2, 4], "x": 4, "y": 2.42},
-
-                {"matrix": [6, 0], "x": 7, "y": 2.42},
-                {"matrix": [6, 1], "x": 8, "y": 2.28},
-                {"matrix": [6, 2], "x": 9, "y": 2},
-                {"matrix": [6, 3], "x": 10, "y": 2.31},
-                {"matrix": [6, 4], "x": 11, "y": 2.93},
-
-                {"matrix": [3, 3], "x": 3.5, "y": 3.75},
-                {"matrix": [3, 4], "x": 4.5, "y": 4},
-
-                {"matrix": [7, 0], "x": 6.5, "y": 4},
-                {"matrix": [7, 1], "x": 7.5, "y": 3.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ferris/0_1/keyboard.json b/keyboards/ferris/0_1/keyboard.json
new file mode 100644
index 00000000000..a7f7c08bec1
--- /dev/null
+++ b/keyboards/ferris/0_1/keyboard.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "Ferris the keeb",
+    "manufacturer": "Pierre",
+    "usb": {
+        "vid": "0xC2AB",
+        "pid": "0x0000",
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "unicode": true
+    },
+    "build": {
+        "lto": true
+    },
+    "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.93},
+                {"matrix": [0, 1], "x": 1, "y": 0.31},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.28},
+                {"matrix": [0, 4], "x": 4, "y": 0.42},
+
+                {"matrix": [4, 0], "x": 7, "y": 0.42},
+                {"matrix": [4, 1], "x": 8, "y": 0.28},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0.31},
+                {"matrix": [4, 4], "x": 11, "y": 0.93},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.93},
+                {"matrix": [1, 1], "x": 1, "y": 1.31},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.28},
+                {"matrix": [1, 4], "x": 4, "y": 1.42},
+
+                {"matrix": [5, 0], "x": 7, "y": 1.42},
+                {"matrix": [5, 1], "x": 8, "y": 1.28},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1.31},
+                {"matrix": [5, 4], "x": 11, "y": 1.93},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.93},
+                {"matrix": [2, 1], "x": 1, "y": 2.31},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.28},
+                {"matrix": [2, 4], "x": 4, "y": 2.42},
+
+                {"matrix": [6, 0], "x": 7, "y": 2.42},
+                {"matrix": [6, 1], "x": 8, "y": 2.28},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 3], "x": 10, "y": 2.31},
+                {"matrix": [6, 4], "x": 11, "y": 2.93},
+
+                {"matrix": [3, 3], "x": 3.5, "y": 3.75},
+                {"matrix": [3, 4], "x": 4.5, "y": 4},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 4},
+                {"matrix": [7, 1], "x": 7.5, "y": 3.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ferris/0_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
deleted file mode 100644
index 06a826450b4..00000000000
--- a/keyboards/ferris/0_2/bling/info.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "keyboard_name": "Ferris 0.2 - Bling",
-    "usb": {
-        "pid": "0x0002"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "is31fl3731"
-    }
-}
diff --git a/keyboards/ferris/0_2/bling/keyboard.json b/keyboards/ferris/0_2/bling/keyboard.json
new file mode 100644
index 00000000000..22ef500d6da
--- /dev/null
+++ b/keyboards/ferris/0_2/bling/keyboard.json
@@ -0,0 +1,57 @@
+{
+    "keyboard_name": "Ferris 0.2 - Bling",
+    "usb": {
+        "pid": "0x0002"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "is31fl3731"
+    },
+    "features": {
+        "rgb_matrix": true
+    }
+}
diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk
deleted file mode 100644
index aad92997d0f..00000000000
--- a/keyboards/ferris/0_2/bling/rules.mk
+++ /dev/null
@@ -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
deleted file mode 100644
index 8244960e45a..00000000000
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "keyboard_name": "7V Hotswap",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.fjlaboratories.com/",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0014",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["B0", "F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 4,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_75_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [3, 13], "x": 14, "y": 1.25},
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/7vhotswap/keyboard.json b/keyboards/fjlabs/7vhotswap/keyboard.json
new file mode 100644
index 00000000000..220cf28831f
--- /dev/null
+++ b/keyboards/fjlabs/7vhotswap/keyboard.json
@@ -0,0 +1,138 @@
+{
+    "keyboard_name": "7V Hotswap",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.fjlaboratories.com/",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0014",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["B0", "F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 4,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_75_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index 041d8a1d2fe..00000000000
--- a/keyboards/fjlabs/ad65/info.json
+++ /dev/null
@@ -1,723 +0,0 @@
-{
-    "keyboard_name": "AD65",
-    "manufacturer": "Absolute Designs",
-    "url": "https://arnoldh93.wixsite.com/website",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0010",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-        "65_ansi_blocker",
-        "65_ansi_blocker_split_bs",
-        "65_ansi_blocker_tsangan",
-        "65_ansi_blocker_tsangan_split_bs",
-        "65_iso_blocker",
-        "65_iso_blocker_split_bs",
-        "65_iso_blocker_tsangan",
-        "65_iso_blocker_tsangan_split_bs"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/ad65/keyboard.json b/keyboards/fjlabs/ad65/keyboard.json
new file mode 100644
index 00000000000..19adad79325
--- /dev/null
+++ b/keyboards/fjlabs/ad65/keyboard.json
@@ -0,0 +1,730 @@
+{
+    "keyboard_name": "AD65",
+    "manufacturer": "Absolute Designs",
+    "url": "https://arnoldh93.wixsite.com/website",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0010",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index 77b5fbe9566..00000000000
--- a/keyboards/fjlabs/avalon/info.json
+++ /dev/null
@@ -1,853 +0,0 @@
-{
-    "keyboard_name": "Avalon",
-    "manufacturer": "Trailblazer Keyboards",
-    "url": "https://fjlaboratories.com/",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0015",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "rgblight": {
-        "led_count": 6,
-        "brightness_steps": 12,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "ws2812": {
-        "pin": "D6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker_tsangan": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/avalon/keyboard.json b/keyboards/fjlabs/avalon/keyboard.json
new file mode 100644
index 00000000000..2407c3ec26b
--- /dev/null
+++ b/keyboards/fjlabs/avalon/keyboard.json
@@ -0,0 +1,861 @@
+{
+    "keyboard_name": "Avalon",
+    "manufacturer": "Trailblazer Keyboards",
+    "url": "https://fjlaboratories.com/",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0015",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "rgblight": {
+        "led_count": 6,
+        "brightness_steps": 12,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "ws2812": {
+        "pin": "D6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index 5e0d9d5fb9b..00000000000
--- a/keyboards/fjlabs/bks65/info.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-    "keyboard_name": "BKS65",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "rgblight": {
-        "led_count": 24,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/bks65/keyboard.json b/keyboards/fjlabs/bks65/keyboard.json
new file mode 100644
index 00000000000..5be09bfe0d0
--- /dev/null
+++ b/keyboards/fjlabs/bks65/keyboard.json
@@ -0,0 +1,126 @@
+{
+    "keyboard_name": "BKS65",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "rgblight": {
+        "led_count": 24,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index dae926d08c9..00000000000
--- a/keyboards/fjlabs/bks65solder/info.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-    "keyboard_name": "BKS65 Solder",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0099",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 24,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/bks65solder/keyboard.json b/keyboards/fjlabs/bks65solder/keyboard.json
new file mode 100644
index 00000000000..609dc4cdbc0
--- /dev/null
+++ b/keyboards/fjlabs/bks65solder/keyboard.json
@@ -0,0 +1,203 @@
+{
+    "keyboard_name": "BKS65 Solder",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0099",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 24,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index 2f53b237d24..00000000000
--- a/keyboards/fjlabs/bolsa65/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "keyboard_name": "Bolsa65",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
-        "rows": ["F1", "F0", "F6", "F5", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi_blocker"],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/bolsa65/keyboard.json b/keyboards/fjlabs/bolsa65/keyboard.json
new file mode 100644
index 00000000000..9deb09fef29
--- /dev/null
+++ b/keyboards/fjlabs/bolsa65/keyboard.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "Bolsa65",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["F1", "F0", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index cd2f6a7ac2f..00000000000
--- a/keyboards/fjlabs/kf87/info.json
+++ /dev/null
@@ -1,147 +0,0 @@
-{
-    "keyboard_name": "KF87",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0006",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
-        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C4",
-        "scroll_lock": "C6"
-    },
-    "ws2812": {
-        "pin": "C2"
-    },
-    "rgblight": {
-        "led_count": 87,
-        "max_brightness": 86,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "at90usb646",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_tkl_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/kf87/keyboard.json b/keyboards/fjlabs/kf87/keyboard.json
new file mode 100644
index 00000000000..e4f48acc8ec
--- /dev/null
+++ b/keyboards/fjlabs/kf87/keyboard.json
@@ -0,0 +1,155 @@
+{
+    "keyboard_name": "KF87",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.fjlaboratories.com/",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0006",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C4",
+        "scroll_lock": "C6"
+    },
+    "ws2812": {
+        "pin": "C2"
+    },
+    "rgblight": {
+        "led_count": 87,
+        "max_brightness": 86,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "at90usb646",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_tkl_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index ed02d7d3b42..00000000000
--- a/keyboards/fjlabs/kyuu/info.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-    "keyboard_name": "Kyuu Hotswap",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1012",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 16,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_65_ansi_blocker_badge": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/kyuu/keyboard.json b/keyboards/fjlabs/kyuu/keyboard.json
new file mode 100644
index 00000000000..a16e2835cf2
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/keyboard.json
@@ -0,0 +1,126 @@
+{
+    "keyboard_name": "Kyuu Hotswap",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1012",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 16,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_badge": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index e8616b291be..00000000000
--- a/keyboards/fjlabs/ldk65/info.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "keyboard_name": "LDK65",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/ldk65/keyboard.json b/keyboards/fjlabs/ldk65/keyboard.json
new file mode 100644
index 00000000000..a9d997c67e0
--- /dev/null
+++ b/keyboards/fjlabs/ldk65/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "LDK65",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index db91dbb021c..00000000000
--- a/keyboards/fjlabs/midway60/info.json
+++ /dev/null
@@ -1,664 +0,0 @@
-{
-    "keyboard_name": "Midway60",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1002",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/midway60/keyboard.json b/keyboards/fjlabs/midway60/keyboard.json
new file mode 100644
index 00000000000..0f5b1e13bca
--- /dev/null
+++ b/keyboards/fjlabs/midway60/keyboard.json
@@ -0,0 +1,671 @@
+{
+    "keyboard_name": "Midway60",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1002",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index 8c42aa97b64..00000000000
--- a/keyboards/fjlabs/mk61rgbansi/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "keyboard_name": "MK61-RGB-ANSI",
-    "manufacturer": "Mechanical Keyboards LLC",
-    "url": "https://www.fjlaboratories.com/",
-    "maintainer": "Mechanical Keyboards, LLC",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1011",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 64,
-        "max_brightness": 108,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/mk61rgbansi/keyboard.json b/keyboards/fjlabs/mk61rgbansi/keyboard.json
new file mode 100644
index 00000000000..de26f98ebe6
--- /dev/null
+++ b/keyboards/fjlabs/mk61rgbansi/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "MK61-RGB-ANSI",
+    "manufacturer": "Mechanical Keyboards LLC",
+    "url": "https://www.fjlaboratories.com/",
+    "maintainer": "Mechanical Keyboards, LLC",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1011",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 64,
+        "max_brightness": 108,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index 2d9e806101e..00000000000
--- a/keyboards/fjlabs/peaker/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "keyboard_name": "Peaker",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.lucidkb.com",
-    "maintainer": "Lucid",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0020",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
-        "rows": ["B5", "B6", "C0", "E1", "E0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "at90usb646",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_tkl_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [0, 16], "x": 16.25, "y": 0},
-                {"matrix": [1, 0], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 15], "x": 15.25, "y": 1},
-                {"matrix": [1, 16], "x": 16.25, "y": 1},
-                {"matrix": [2, 0], "x": 17.25, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 15], "x": 16.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4},
-                {"matrix": [4, 16], "x": 17.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/peaker/keyboard.json b/keyboards/fjlabs/peaker/keyboard.json
new file mode 100644
index 00000000000..73f4f754c31
--- /dev/null
+++ b/keyboards/fjlabs/peaker/keyboard.json
@@ -0,0 +1,113 @@
+{
+    "keyboard_name": "Peaker",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.lucidkb.com",
+    "maintainer": "Lucid",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0020",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "at90usb646",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_tkl_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [1, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [2, 0], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index 6757372bf9f..00000000000
--- a/keyboards/fjlabs/polaris/info.json
+++ /dev/null
@@ -1,666 +0,0 @@
-{
-    "keyboard_name": "Polaris",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.fjlaboratories.com/projects/",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x9001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/polaris/keyboard.json b/keyboards/fjlabs/polaris/keyboard.json
new file mode 100644
index 00000000000..c4f3caf2879
--- /dev/null
+++ b/keyboards/fjlabs/polaris/keyboard.json
@@ -0,0 +1,673 @@
+{
+    "keyboard_name": "Polaris",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.fjlaboratories.com/projects/",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x9001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index dd717bb68a8..00000000000
--- a/keyboards/fjlabs/ready100/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "keyboard_name": "Ready100",
-    "manufacturer": "FJLabs",
-    "url": "https://www.ready100.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1003",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 64,
-        "max_brightness": 108,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_64key": "LAYOUT_64_ansi"
-    },
-    "community_layouts": ["64_ansi"],
-    "layouts": {
-        "LAYOUT_64_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
-                {"matrix": [3, 1], "x": 2, "y": 3},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3},
-                {"matrix": [3, 5], "x": 6, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/ready100/keyboard.json b/keyboards/fjlabs/ready100/keyboard.json
new file mode 100644
index 00000000000..b5940b9c527
--- /dev/null
+++ b/keyboards/fjlabs/ready100/keyboard.json
@@ -0,0 +1,123 @@
+{
+    "keyboard_name": "Ready100",
+    "manufacturer": "FJLabs",
+    "url": "https://www.ready100.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1003",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 64,
+        "max_brightness": 108,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT_64key": "LAYOUT_64_ansi"
+    },
+    "community_layouts": ["64_ansi"],
+    "layouts": {
+        "LAYOUT_64_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index f71ad6fca21..00000000000
--- a/keyboards/fjlabs/sinanju/info.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "keyboard_name": "Sinanju",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1022",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_60_ansi_wkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/sinanju/keyboard.json b/keyboards/fjlabs/sinanju/keyboard.json
new file mode 100644
index 00000000000..ef9cf0e872b
--- /dev/null
+++ b/keyboards/fjlabs/sinanju/keyboard.json
@@ -0,0 +1,164 @@
+{
+    "keyboard_name": "Sinanju",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1022",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index 9f34f4aa528..00000000000
--- a/keyboards/fjlabs/sinanjuwk/info.json
+++ /dev/null
@@ -1,444 +0,0 @@
-{
-    "keyboard_name": "Sinanju WK",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1023",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
-    },
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb"
-    ],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/sinanjuwk/keyboard.json b/keyboards/fjlabs/sinanjuwk/keyboard.json
new file mode 100644
index 00000000000..e825ae335e7
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/keyboard.json
@@ -0,0 +1,451 @@
+{
+    "keyboard_name": "Sinanju WK",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1023",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index ecc495d59a9..00000000000
--- a/keyboards/fjlabs/solanis/info.json
+++ /dev/null
@@ -1,1003 +0,0 @@
-{
-    "keyboard_name": "Solanis",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.fjlaboratories.com/",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0017",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
-        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "B7"
-    },
-    "rgblight": {
-        "led_count": 24,
-        "max_brightness": 172,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "at90usb646",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-        "tkl_ansi",
-        "tkl_ansi_split_bs_rshift",
-        "tkl_ansi_tsangan",
-        "tkl_ansi_tsangan_split_bs_rshift",
-        "tkl_f13_ansi",
-        "tkl_f13_ansi_split_bs_rshift",
-        "tkl_f13_ansi_tsangan",
-        "tkl_f13_ansi_tsangan_split_bs_rshift"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.25},
-                {"label": "Space", "matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5.25, "w": 2.75},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/solanis/keyboard.json b/keyboards/fjlabs/solanis/keyboard.json
new file mode 100644
index 00000000000..12103d10586
--- /dev/null
+++ b/keyboards/fjlabs/solanis/keyboard.json
@@ -0,0 +1,1011 @@
+{
+    "keyboard_name": "Solanis",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.fjlaboratories.com/",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0017",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgblight": {
+        "led_count": 24,
+        "max_brightness": 172,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "at90usb646",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_split_bs_rshift",
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift",
+        "tkl_f13_ansi",
+        "tkl_f13_ansi_split_bs_rshift",
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_ansi_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"label": "Space", "matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index 822d9662d42..00000000000
--- a/keyboards/fjlabs/swordfish/info.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-    "keyboard_name": "Swordfish",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.fjlaboratories.com/",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0024",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B2", "B3", "B7", "B5", "B4", "D7", "D6", "D4", "D5"],
-        "rows": ["B0", "B1", "C7", "C6", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 1,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_2u_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [1, 5], "x": 5, "y": 0},
-                {"matrix": [0, 5], "x": 6, "y": 0},
-                {"matrix": [0, 6], "x": 9, "y": 0},
-                {"matrix": [0, 7], "x": 10, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-                {"matrix": [0, 12], "x": 15, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [2, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 8.5, "y": 1},
-                {"matrix": [1, 7], "x": 9.5, "y": 1},
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1},
-                {"matrix": [1, 10], "x": 12.5, "y": 1},
-                {"matrix": [1, 11], "x": 13.5, "y": 1},
-                {"matrix": [1, 12], "x": 14.5, "y": 1},
-                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 17.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [3, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 8.75, "y": 2},
-                {"matrix": [2, 7], "x": 9.75, "y": 2},
-                {"matrix": [2, 8], "x": 10.75, "y": 2},
-                {"matrix": [2, 9], "x": 11.75, "y": 2},
-                {"matrix": [2, 10], "x": 12.75, "y": 2},
-                {"matrix": [2, 11], "x": 13.75, "y": 2},
-                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 17.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [4, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 8.25, "y": 3},
-                {"matrix": [3, 7], "x": 9.25, "y": 3},
-                {"matrix": [3, 8], "x": 10.25, "y": 3},
-                {"matrix": [3, 9], "x": 11.25, "y": 3},
-                {"matrix": [3, 10], "x": 12.25, "y": 3},
-                {"matrix": [3, 11], "x": 13.25, "y": 3},
-                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 16.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
-            ]
-        },
-        "LAYOUT_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [1, 5], "x": 5, "y": 0},
-                {"matrix": [0, 5], "x": 6, "y": 0},
-                {"matrix": [0, 6], "x": 9, "y": 0},
-                {"matrix": [0, 7], "x": 10, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-                {"matrix": [0, 12], "x": 15, "y": 0},
-                {"matrix": [0, 13], "x": 16, "y": 0},
-                {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [2, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 8.5, "y": 1},
-                {"matrix": [1, 7], "x": 9.5, "y": 1},
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1},
-                {"matrix": [1, 10], "x": 12.5, "y": 1},
-                {"matrix": [1, 11], "x": 13.5, "y": 1},
-                {"matrix": [1, 12], "x": 14.5, "y": 1},
-                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 17.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [3, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 8.75, "y": 2},
-                {"matrix": [2, 7], "x": 9.75, "y": 2},
-                {"matrix": [2, 8], "x": 10.75, "y": 2},
-                {"matrix": [2, 9], "x": 11.75, "y": 2},
-                {"matrix": [2, 10], "x": 12.75, "y": 2},
-                {"matrix": [2, 11], "x": 13.75, "y": 2},
-                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 17.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [4, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 8.25, "y": 3},
-                {"matrix": [3, 7], "x": 9.25, "y": 3},
-                {"matrix": [3, 8], "x": 10.25, "y": 3},
-                {"matrix": [3, 9], "x": 11.25, "y": 3},
-                {"matrix": [3, 10], "x": 12.25, "y": 3},
-                {"matrix": [3, 11], "x": 13.25, "y": 3},
-                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 16.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/swordfish/keyboard.json b/keyboards/fjlabs/swordfish/keyboard.json
new file mode 100644
index 00000000000..331bae459c0
--- /dev/null
+++ b/keyboards/fjlabs/swordfish/keyboard.json
@@ -0,0 +1,201 @@
+{
+    "keyboard_name": "Swordfish",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.fjlaboratories.com/",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0024",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B2", "B3", "B7", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["B0", "B1", "C7", "C6", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 1,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_2u_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [1, 5], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 9, "y": 0},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [1, 7], "x": 9.5, "y": 1},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [3, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 8.75, "y": 2},
+                {"matrix": [2, 7], "x": 9.75, "y": 2},
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [4, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [1, 5], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 9, "y": 0},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [1, 7], "x": 9.5, "y": 1},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [3, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 8.75, "y": 2},
+                {"matrix": [2, 7], "x": 9.75, "y": 2},
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [4, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index f161284ae01..00000000000
--- a/keyboards/fjlabs/tf60ansi/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "keyboard_name": "TF60 ANSI",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1004",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 64,
-        "max_brightness": 108,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/tf60ansi/keyboard.json b/keyboards/fjlabs/tf60ansi/keyboard.json
new file mode 100644
index 00000000000..69ff0690a18
--- /dev/null
+++ b/keyboards/fjlabs/tf60ansi/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "TF60 ANSI",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com/",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1004",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 64,
+        "max_brightness": 108,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index e3051c0da7b..00000000000
--- a/keyboards/fjlabs/tf60v2/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "keyboard_name": "TF60 V2",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1005",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 64,
-        "max_brightness": 108,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi_arrow"],
-    "layouts": {
-        "LAYOUT_60_ansi_arrow": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/tf60v2/keyboard.json b/keyboards/fjlabs/tf60v2/keyboard.json
new file mode 100644
index 00000000000..337a06843f1
--- /dev/null
+++ b/keyboards/fjlabs/tf60v2/keyboard.json
@@ -0,0 +1,123 @@
+{
+    "keyboard_name": "TF60 V2",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com/",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1005",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 64,
+        "max_brightness": 108,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["60_ansi_arrow"],
+    "layouts": {
+        "LAYOUT_60_ansi_arrow": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/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
deleted file mode 100644
index ab105ff4a9f..00000000000
--- a/keyboards/fjlabs/tf65rgbv2/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-    "keyboard_name": "TF65 RGB V2",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1007",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 68,
-        "max_brightness": 96,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/tf65rgbv2/keyboard.json b/keyboards/fjlabs/tf65rgbv2/keyboard.json
new file mode 100644
index 00000000000..dd567c63b85
--- /dev/null
+++ b/keyboards/fjlabs/tf65rgbv2/keyboard.json
@@ -0,0 +1,128 @@
+{
+    "keyboard_name": "TF65 RGB V2",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com/",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1007",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 68,
+        "max_brightness": 96,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/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/fluorite/info.json b/keyboards/fluorite/info.json
deleted file mode 100644
index f28694389e9..00000000000
--- a/keyboards/fluorite/info.json
+++ /dev/null
@@ -1,168 +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": {
-        "enabled": true,
-        "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 ad81ce036a2..00000000000
--- a/keyboards/fluorite/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/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json
deleted file mode 100644
index 850cb3f5d3b..00000000000
--- a/keyboards/flxlb/zplit/info.json
+++ /dev/null
@@ -1,104 +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": {
-        "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/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 901257cd173..00000000000
--- a/keyboards/flxlb/zplit/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 = 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
diff --git a/keyboards/fortitude60/rev1/keyboard.json b/keyboards/fortitude60/rev1/keyboard.json
index ff8756bb684..f651c784247 100644
--- a/keyboards/fortitude60/rev1/keyboard.json
+++ b/keyboards/fortitude60/rev1/keyboard.json
@@ -29,6 +29,11 @@
   },
   "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 181f73ba110..ef158b8cf08 100644
--- a/keyboards/fortitude60/rules.mk
+++ b/keyboards/fortitude60/rules.mk
@@ -1,14 +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
-
 DEFAULT_FOLDER = fortitude60/rev1
diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json
deleted file mode 100644
index 0d2ce4aecac..00000000000
--- a/keyboards/fractal/info.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-  "keyboard_name": "Fractal",
-  "manufacturer": "KeyPCB",
-  "url": "https://keypcb.bigcartel.com/product/fractal-keyboard-group-buy",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D3"],
-    "rows": ["B1", "F7", "F6", "F5", "F4"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "community_layouts": ["ortho_5x12"],
-  "layouts": {
-    "LAYOUT_ortho_5x12": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4},
-        {"matrix": [4, 2], "x": 2, "y": 4},
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 4], "x": 4, "y": 4},
-        {"matrix": [4, 5], "x": 5, "y": 4},
-        {"matrix": [4, 6], "x": 6, "y": 4},
-        {"matrix": [4, 7], "x": 7, "y": 4},
-        {"matrix": [4, 8], "x": 8, "y": 4},
-        {"matrix": [4, 9], "x": 9, "y": 4},
-        {"matrix": [4, 10], "x": 10, "y": 4},
-        {"matrix": [4, 11], "x": 11, "y": 4}
-      ]
-    },
-    "LAYOUT_preonic_mit": {
-        "layout": [
-          {"matrix": [0, 0], "x": 0, "y": 0},
-          {"matrix": [0, 1], "x": 1, "y": 0},
-          {"matrix": [0, 2], "x": 2, "y": 0},
-          {"matrix": [0, 3], "x": 3, "y": 0},
-          {"matrix": [0, 4], "x": 4, "y": 0},
-          {"matrix": [0, 5], "x": 5, "y": 0},
-          {"matrix": [0, 6], "x": 6, "y": 0},
-          {"matrix": [0, 7], "x": 7, "y": 0},
-          {"matrix": [0, 8], "x": 8, "y": 0},
-          {"matrix": [0, 9], "x": 9, "y": 0},
-          {"matrix": [0, 10], "x": 10, "y": 0},
-          {"matrix": [0, 11], "x": 11, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1},
-          {"matrix": [1, 1], "x": 1, "y": 1},
-          {"matrix": [1, 2], "x": 2, "y": 1},
-          {"matrix": [1, 3], "x": 3, "y": 1},
-          {"matrix": [1, 4], "x": 4, "y": 1},
-          {"matrix": [1, 5], "x": 5, "y": 1},
-          {"matrix": [1, 6], "x": 6, "y": 1},
-          {"matrix": [1, 7], "x": 7, "y": 1},
-          {"matrix": [1, 8], "x": 8, "y": 1},
-          {"matrix": [1, 9], "x": 9, "y": 1},
-          {"matrix": [1, 10], "x": 10, "y": 1},
-          {"matrix": [1, 11], "x": 11, "y": 1},
-
-          {"matrix": [2, 0], "x": 0, "y": 2},
-          {"matrix": [2, 1], "x": 1, "y": 2},
-          {"matrix": [2, 2], "x": 2, "y": 2},
-          {"matrix": [2, 3], "x": 3, "y": 2},
-          {"matrix": [2, 4], "x": 4, "y": 2},
-          {"matrix": [2, 5], "x": 5, "y": 2},
-          {"matrix": [2, 6], "x": 6, "y": 2},
-          {"matrix": [2, 7], "x": 7, "y": 2},
-          {"matrix": [2, 8], "x": 8, "y": 2},
-          {"matrix": [2, 9], "x": 9, "y": 2},
-          {"matrix": [2, 10], "x": 10, "y": 2},
-          {"matrix": [2, 11], "x": 11, "y": 2},
-
-          {"matrix": [3, 0], "x": 0, "y": 3},
-          {"matrix": [3, 1], "x": 1, "y": 3},
-          {"matrix": [3, 2], "x": 2, "y": 3},
-          {"matrix": [3, 3], "x": 3, "y": 3},
-          {"matrix": [3, 4], "x": 4, "y": 3},
-          {"matrix": [3, 5], "x": 5, "y": 3},
-          {"matrix": [3, 6], "x": 6, "y": 3},
-          {"matrix": [3, 7], "x": 7, "y": 3},
-          {"matrix": [3, 8], "x": 8, "y": 3},
-          {"matrix": [3, 9], "x": 9, "y": 3},
-          {"matrix": [3, 10], "x": 10, "y": 3},
-          {"matrix": [3, 11], "x": 11, "y": 3},
-
-          {"matrix": [4, 0], "x": 0, "y": 4},
-          {"matrix": [4, 1], "x": 1, "y": 4},
-          {"matrix": [4, 2], "x": 2, "y": 4},
-          {"matrix": [4, 3], "x": 3, "y": 4},
-          {"matrix": [4, 4], "x": 4, "y": 4},
-          {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
-          {"matrix": [4, 7], "x": 7, "y": 4},
-          {"matrix": [4, 8], "x": 8, "y": 4},
-          {"matrix": [4, 9], "x": 9, "y": 4},
-          {"matrix": [4, 10], "x": 10, "y": 4},
-          {"matrix": [4, 11], "x": 11, "y": 4}
-        ]
-      }
-    }
-}
diff --git a/keyboards/fractal/keyboard.json b/keyboards/fractal/keyboard.json
new file mode 100644
index 00000000000..4086ff969fe
--- /dev/null
+++ b/keyboards/fractal/keyboard.json
@@ -0,0 +1,162 @@
+{
+  "keyboard_name": "Fractal",
+  "manufacturer": "KeyPCB",
+  "url": "https://keypcb.bigcartel.com/product/fractal-keyboard-group-buy",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D3"],
+    "rows": ["B1", "F7", "F6", "F5", "F4"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "community_layouts": ["ortho_5x12"],
+  "layouts": {
+    "LAYOUT_ortho_5x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+        {"matrix": [4, 7], "x": 7, "y": 4},
+        {"matrix": [4, 8], "x": 8, "y": 4},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4}
+      ]
+    },
+    "LAYOUT_preonic_mit": {
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+          {"matrix": [1, 7], "x": 7, "y": 1},
+          {"matrix": [1, 8], "x": 8, "y": 1},
+          {"matrix": [1, 9], "x": 9, "y": 1},
+          {"matrix": [1, 10], "x": 10, "y": 1},
+          {"matrix": [1, 11], "x": 11, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+          {"matrix": [2, 7], "x": 7, "y": 2},
+          {"matrix": [2, 8], "x": 8, "y": 2},
+          {"matrix": [2, 9], "x": 9, "y": 2},
+          {"matrix": [2, 10], "x": 10, "y": 2},
+          {"matrix": [2, 11], "x": 11, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [3, 6], "x": 6, "y": 3},
+          {"matrix": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [3, 9], "x": 9, "y": 3},
+          {"matrix": [3, 10], "x": 10, "y": 3},
+          {"matrix": [3, 11], "x": 11, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 4], "x": 4, "y": 4},
+          {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+          {"matrix": [4, 7], "x": 7, "y": 4},
+          {"matrix": [4, 8], "x": 8, "y": 4},
+          {"matrix": [4, 9], "x": 9, "y": 4},
+          {"matrix": [4, 10], "x": 10, "y": 4},
+          {"matrix": [4, 11], "x": 11, "y": 4}
+        ]
+      }
+    }
+}
diff --git a/keyboards/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
deleted file mode 100644
index 2e99c5806b2..00000000000
--- a/keyboards/frobiac/blackbowl/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "manufacturer": "frobiac",
-    "keyboard_name": "blackbowl",
-    "url": "https://www.github.com/frobiac/adnw",
-    "maintainer": "frobiac",
-    "bootloader": "halfkay",
-    "processor": "atmega32u4",
-    "diode_direction": "ROW2COL",
-    "features": {
-        "bootmagic": false,
-        "command": false,
-        "console": false,
-        "dynamic_macro": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
-    "build": {
-        "lto": true
-    },
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x1D50",
-        "vid": "0x6033"
-    },
-    "matrix_pins": {
-        "cols": [null, null, null, null],
-        "rows": [null, null, null, null, null, null, null, null, null, null]
-    },
-  "layouts": {
-    "LAYOUT": {
-       "layout": [
-                {"matrix": [5, 3], "label": "K", "x": 0, "y": 1},
-                {"matrix": [6, 3], "label": "U", "x": 1, "y": 0.5},
-                {"matrix": [7, 3], "label": "Q", "x": 2, "y": 0},
-                {"matrix": [8, 3], "label": ".", "x": 3, "y": 0},
-                {"matrix": [9, 3], "label": "J", "x": 4, "y": 0},
-
-                {"matrix": [0, 3], "label": "P", "x": 6, "y": 0},
-                {"matrix": [1, 3], "label": "C", "x": 7, "y": 0},
-                {"matrix": [2, 3], "label": "L", "x": 8, "y": 0},
-                {"matrix": [3, 3], "label": "M", "x": 9, "y": 0.5},
-                {"matrix": [4, 3], "label": "F", "x": 10, "y": 1},
-
-                {"matrix": [5, 2], "label": "H", "x": 0, "y": 2},
-                {"matrix": [6, 2], "label": "I", "x": 1, "y": 1.5},
-                {"matrix": [7, 2], "label": "E", "x": 2, "y": 1},
-                {"matrix": [8, 2], "label": "A", "x": 3, "y": 1},
-                {"matrix": [9, 2], "label": "O", "x": 4, "y": 1},
-
-                {"matrix": [0, 2], "label": "D", "x": 6, "y": 1},
-                {"matrix": [1, 2], "label": "T", "x": 7, "y": 1},
-                {"matrix": [2, 2], "label": "R", "x": 8, "y": 1},
-                {"matrix": [3, 2], "label": "N", "x": 9, "y": 1.5},
-                {"matrix": [4, 2], "label": "S", "x": 10, "y": 2},
-
-                {"matrix": [5, 1], "label": "X", "x": 0, "y": 3},
-                {"matrix": [6, 1], "label": "Y", "x": 1, "y": 2.5},
-                {"matrix": [7, 1], "label": "-", "x": 2, "y": 2},
-                {"matrix": [8, 1], "label": ",", "x": 3, "y": 2},
-                {"matrix": [9, 1], "label": "/", "x": 4, "y": 2},
-
-                {"matrix": [0, 1], "label": "B", "x": 6, "y": 2},
-                {"matrix": [1, 1], "label": "G", "x": 7, "y": 2},
-                {"matrix": [2, 1], "label": "W", "x": 8, "y": 2},
-                {"matrix": [3, 1], "label": "V", "x": 9, "y": 2.5},
-                {"matrix": [4, 1], "label": "Z", "x": 10, "y": 3},
-
-                {"matrix": [5, 0], "label": " ", "x": 0, "y": 0},
-                {"matrix": [7, 0], "label": "Gui", "x": 2, "y": 3},
-                {"matrix": [8, 0], "label": "tab", "x": 3, "y": 3},
-                {"matrix": [9, 0], "label": "spc", "x": 4, "y": 3},
-
-                {"matrix": [0, 0], "label": "L2", "x": 6, "y": 3},
-                {"matrix": [1, 0], "label": "Sh", "x": 7, "y": 3},
-                {"matrix": [2, 0], "label": "L3", "x": 8, "y": 3},
-                {"matrix": [4, 0], "label": "Fx", "x": 10, "y": 0}
-       ]
-    }
-  }
-}
diff --git a/keyboards/frobiac/blackbowl/keyboard.json b/keyboards/frobiac/blackbowl/keyboard.json
new file mode 100644
index 00000000000..8a4aed19484
--- /dev/null
+++ b/keyboards/frobiac/blackbowl/keyboard.json
@@ -0,0 +1,83 @@
+{
+    "manufacturer": "frobiac",
+    "keyboard_name": "blackbowl",
+    "url": "https://www.github.com/frobiac/adnw",
+    "maintainer": "frobiac",
+    "bootloader": "halfkay",
+    "processor": "atmega32u4",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "dynamic_macro": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "ps2": true,
+        "ps2_mouse": true
+    },
+    "build": {
+        "lto": true
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1D50",
+        "vid": "0x6033"
+    },
+    "matrix_pins": {
+        "cols": [null, null, null, null],
+        "rows": [null, null, null, null, null, null, null, null, null, null]
+    },
+  "layouts": {
+    "LAYOUT": {
+       "layout": [
+                {"matrix": [5, 3], "label": "K", "x": 0, "y": 1},
+                {"matrix": [6, 3], "label": "U", "x": 1, "y": 0.5},
+                {"matrix": [7, 3], "label": "Q", "x": 2, "y": 0},
+                {"matrix": [8, 3], "label": ".", "x": 3, "y": 0},
+                {"matrix": [9, 3], "label": "J", "x": 4, "y": 0},
+
+                {"matrix": [0, 3], "label": "P", "x": 6, "y": 0},
+                {"matrix": [1, 3], "label": "C", "x": 7, "y": 0},
+                {"matrix": [2, 3], "label": "L", "x": 8, "y": 0},
+                {"matrix": [3, 3], "label": "M", "x": 9, "y": 0.5},
+                {"matrix": [4, 3], "label": "F", "x": 10, "y": 1},
+
+                {"matrix": [5, 2], "label": "H", "x": 0, "y": 2},
+                {"matrix": [6, 2], "label": "I", "x": 1, "y": 1.5},
+                {"matrix": [7, 2], "label": "E", "x": 2, "y": 1},
+                {"matrix": [8, 2], "label": "A", "x": 3, "y": 1},
+                {"matrix": [9, 2], "label": "O", "x": 4, "y": 1},
+
+                {"matrix": [0, 2], "label": "D", "x": 6, "y": 1},
+                {"matrix": [1, 2], "label": "T", "x": 7, "y": 1},
+                {"matrix": [2, 2], "label": "R", "x": 8, "y": 1},
+                {"matrix": [3, 2], "label": "N", "x": 9, "y": 1.5},
+                {"matrix": [4, 2], "label": "S", "x": 10, "y": 2},
+
+                {"matrix": [5, 1], "label": "X", "x": 0, "y": 3},
+                {"matrix": [6, 1], "label": "Y", "x": 1, "y": 2.5},
+                {"matrix": [7, 1], "label": "-", "x": 2, "y": 2},
+                {"matrix": [8, 1], "label": ",", "x": 3, "y": 2},
+                {"matrix": [9, 1], "label": "/", "x": 4, "y": 2},
+
+                {"matrix": [0, 1], "label": "B", "x": 6, "y": 2},
+                {"matrix": [1, 1], "label": "G", "x": 7, "y": 2},
+                {"matrix": [2, 1], "label": "W", "x": 8, "y": 2},
+                {"matrix": [3, 1], "label": "V", "x": 9, "y": 2.5},
+                {"matrix": [4, 1], "label": "Z", "x": 10, "y": 3},
+
+                {"matrix": [5, 0], "label": " ", "x": 0, "y": 0},
+                {"matrix": [7, 0], "label": "Gui", "x": 2, "y": 3},
+                {"matrix": [8, 0], "label": "tab", "x": 3, "y": 3},
+                {"matrix": [9, 0], "label": "spc", "x": 4, "y": 3},
+
+                {"matrix": [0, 0], "label": "L2", "x": 6, "y": 3},
+                {"matrix": [1, 0], "label": "Sh", "x": 7, "y": 3},
+                {"matrix": [2, 0], "label": "L3", "x": 8, "y": 3},
+                {"matrix": [4, 0], "label": "Fx", "x": 10, "y": 0}
+       ]
+    }
+  }
+}
diff --git a/keyboards/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/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 7c05cd7371b..00000000000
--- a/keyboards/fungo/rev1/info.json
+++ /dev/null
@@ -1,130 +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": {
-    "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/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 2365546821a..00000000000
--- a/keyboards/fungo/rev1/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 = 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
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
deleted file mode 100644
index 80558ad6929..00000000000
--- a/keyboards/gboards/ergotaco/info.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "keyboard_name": "ErgoTaco",
-    "manufacturer": "g Heavy Industries",
-    "url": "http://gboards.ca",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1337",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "tapping": {
-        "toggle": 1
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [11, 0], "x": 0, "y": 1},
-                {"matrix": [10, 0], "x": 1, "y": 0.5},
-                {"matrix": [9, 0], "x": 2, "y": 0.25},
-                {"matrix": [8, 0], "x": 3, "y": 0},
-                {"matrix": [7, 0], "x": 4, "y": 0.75},
-                {"matrix": [6, 0], "x": 5, "y": 1.5},
-
-                {"matrix": [0, 0], "x": 7, "y": 1.5},
-                {"matrix": [1, 0], "x": 8, "y": 0.75},
-                {"matrix": [2, 0], "x": 9, "y": 0},
-                {"matrix": [3, 0], "x": 10, "y": 0.25},
-                {"matrix": [4, 0], "x": 11, "y": 0.5},
-                {"matrix": [5, 0], "x": 12, "y": 1}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/ergotaco/keyboard.json b/keyboards/gboards/ergotaco/keyboard.json
new file mode 100644
index 00000000000..1d13c2458a7
--- /dev/null
+++ b/keyboards/gboards/ergotaco/keyboard.json
@@ -0,0 +1,42 @@
+{
+    "keyboard_name": "ErgoTaco",
+    "manufacturer": "g Heavy Industries",
+    "url": "http://gboards.ca",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1337",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "tapping": {
+        "toggle": 1
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [11, 0], "x": 0, "y": 1},
+                {"matrix": [10, 0], "x": 1, "y": 0.5},
+                {"matrix": [9, 0], "x": 2, "y": 0.25},
+                {"matrix": [8, 0], "x": 3, "y": 0},
+                {"matrix": [7, 0], "x": 4, "y": 0.75},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+
+                {"matrix": [0, 0], "x": 7, "y": 1.5},
+                {"matrix": [1, 0], "x": 8, "y": 0.75},
+                {"matrix": [2, 0], "x": 9, "y": 0},
+                {"matrix": [3, 0], "x": 10, "y": 0.25},
+                {"matrix": [4, 0], "x": 11, "y": 0.5},
+                {"matrix": [5, 0], "x": 12, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk
index 6fbefbd22d7..5d025b31ef2 100644
--- a/keyboards/gboards/ergotaco/rules.mk
+++ b/keyboards/gboards/ergotaco/rules.mk
@@ -1,7 +1,4 @@
 CUSTOM_MATRIX 		= yes
-EXTRAKEY_ENABLE		= yes
-CONSOLE_ENABLE  	= yes
-COMMAND_ENABLE		= yes
 
 # A bunch of stuff that you shouldn't touch unless you
 # know what you're doing.
diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json
deleted file mode 100644
index 51737f75af8..00000000000
--- a/keyboards/gboards/georgi/info.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "keyboard_name": "Georgi",
-    "manufacturer": "g Heavy Industries",
-    "url": "http://gboards.ca",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1337",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "tapping": {
-        "toggle": 2
-    },
-    "layout_aliases": {
-        "LAYOUT_georgi": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [12, 1], "x": 0, "y": 0.5},
-                {"matrix": [11, 1], "x": 1, "y": 0.5},
-                {"matrix": [10, 1], "x": 2, "y": 0.3},
-                {"matrix": [9, 1], "x": 3, "y": 0},
-                {"matrix": [8, 1], "x": 4, "y": 0.4},
-                {"matrix": [7, 1], "x": 5, "y": 0.5},
-
-                {"matrix": [0, 1], "x": 7, "y": 0.5},
-                {"matrix": [1, 1], "x": 8, "y": 0.4},
-                {"matrix": [2, 1], "x": 9, "y": 0},
-                {"matrix": [3, 1], "x": 10, "y": 0.3},
-                {"matrix": [4, 1], "x": 11, "y": 0.5},
-                {"matrix": [5, 1], "x": 12, "y": 0.5},
-
-                {"matrix": [12, 2], "x": 0, "y": 1.5},
-                {"matrix": [11, 2], "x": 1, "y": 1.5},
-                {"matrix": [10, 2], "x": 2, "y": 1.3},
-                {"matrix": [9, 2], "x": 3, "y": 1},
-                {"matrix": [8, 2], "x": 4, "y": 1.4},
-                {"matrix": [7, 2], "x": 5, "y": 1.5},
-
-                {"matrix": [0, 2], "x": 7, "y": 1.5},
-                {"matrix": [1, 2], "x": 8, "y": 1.4},
-                {"matrix": [2, 2], "x": 9, "y": 1},
-                {"matrix": [3, 2], "x": 10, "y": 1.3},
-                {"matrix": [4, 2], "x": 11, "y": 1.5},
-                {"matrix": [5, 2], "x": 12, "y": 1.5},
-
-                {"matrix": [9, 3], "x": 3, "y": 2.75},
-                {"matrix": [8, 3], "x": 4, "y": 2.75},
-                {"matrix": [7, 3], "x": 5, "y": 2.75},
-
-                {"matrix": [1, 3], "x": 7, "y": 2.75},
-                {"matrix": [0, 3], "x": 8, "y": 2.75},
-                {"matrix": [2, 3], "x": 9, "y": 2.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/georgi/keyboard.json b/keyboards/gboards/georgi/keyboard.json
new file mode 100644
index 00000000000..066797a2415
--- /dev/null
+++ b/keyboards/gboards/georgi/keyboard.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "Georgi",
+    "manufacturer": "g Heavy Industries",
+    "url": "http://gboards.ca",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1337",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "steno": true
+    },
+    "build": {
+        "lto": true
+    },
+    "tapping": {
+        "toggle": 2
+    },
+    "layout_aliases": {
+        "LAYOUT_georgi": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [12, 1], "x": 0, "y": 0.5},
+                {"matrix": [11, 1], "x": 1, "y": 0.5},
+                {"matrix": [10, 1], "x": 2, "y": 0.3},
+                {"matrix": [9, 1], "x": 3, "y": 0},
+                {"matrix": [8, 1], "x": 4, "y": 0.4},
+                {"matrix": [7, 1], "x": 5, "y": 0.5},
+
+                {"matrix": [0, 1], "x": 7, "y": 0.5},
+                {"matrix": [1, 1], "x": 8, "y": 0.4},
+                {"matrix": [2, 1], "x": 9, "y": 0},
+                {"matrix": [3, 1], "x": 10, "y": 0.3},
+                {"matrix": [4, 1], "x": 11, "y": 0.5},
+                {"matrix": [5, 1], "x": 12, "y": 0.5},
+
+                {"matrix": [12, 2], "x": 0, "y": 1.5},
+                {"matrix": [11, 2], "x": 1, "y": 1.5},
+                {"matrix": [10, 2], "x": 2, "y": 1.3},
+                {"matrix": [9, 2], "x": 3, "y": 1},
+                {"matrix": [8, 2], "x": 4, "y": 1.4},
+                {"matrix": [7, 2], "x": 5, "y": 1.5},
+
+                {"matrix": [0, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 2], "x": 8, "y": 1.4},
+                {"matrix": [2, 2], "x": 9, "y": 1},
+                {"matrix": [3, 2], "x": 10, "y": 1.3},
+                {"matrix": [4, 2], "x": 11, "y": 1.5},
+                {"matrix": [5, 2], "x": 12, "y": 1.5},
+
+                {"matrix": [9, 3], "x": 3, "y": 2.75},
+                {"matrix": [8, 3], "x": 4, "y": 2.75},
+                {"matrix": [7, 3], "x": 5, "y": 2.75},
+
+                {"matrix": [1, 3], "x": 7, "y": 2.75},
+                {"matrix": [0, 3], "x": 8, "y": 2.75},
+                {"matrix": [2, 3], "x": 9, "y": 2.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk
index 5b63e269fa5..42be966784a 100644
--- a/keyboards/gboards/georgi/rules.mk
+++ b/keyboards/gboards/georgi/rules.mk
@@ -1,18 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
-STENO_ENABLE = yes
-LTO_ENABLE = yes
 
 SRC += matrix.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
+I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
deleted file mode 100644
index bc53f2db5f0..00000000000
--- a/keyboards/gboards/gergo/info.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    "keyboard_name": "Gergo",
-    "manufacturer": "g Heavy Industries",
-    "url": "http://gboards.ca",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1307",
-        "device_version": "0.0.1"
-    },
-    "build": {
-        "debounce_type": "sym_eager_pr"
-    },
-    "bootmagic": {
-        "matrix": [13, 2]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "tapping": {
-        "toggle": 1
-    },
-    "layout_aliases": {
-        "LAYOUT_gergo": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [6, 0], "x": 0, "y": 0.38, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 0.38},
-                {"matrix": [4, 0], "x": 2.5, "y": 0.13},
-                {"matrix": [3, 0], "x": 3.5, "y": 0},
-                {"matrix": [2, 0], "x": 4.5, "y": 0.13},
-                {"matrix": [1, 0], "x": 5.5, "y": 0.25},
-
-                {"matrix": [8, 0], "x": 13, "y": 0.25},
-                {"matrix": [9, 0], "x": 14, "y": 0.13},
-                {"matrix": [10, 0], "x": 15, "y": 0},
-                {"matrix": [11, 0], "x": 16, "y": 0.13},
-                {"matrix": [12, 0], "x": 17, "y": 0.38},
-                {"matrix": [13, 0], "x": 18, "y": 0.38, "w": 1.5},
-
-                {"matrix": [6, 1], "x": 0, "y": 1.38, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 1.38},
-                {"matrix": [4, 1], "x": 2.5, "y": 1.13},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 1], "x": 4.5, "y": 1.13},
-                {"matrix": [1, 1], "x": 5.5, "y": 1.25},
-                {"matrix": [0, 1], "x": 6.5, "y": 0.25, "h": 1.5},
-
-                {"matrix": [7, 1], "x": 12, "y": 0.25, "h": 1.5},
-                {"matrix": [8, 1], "x": 13, "y": 1.25},
-                {"matrix": [9, 1], "x": 14, "y": 1.13},
-                {"matrix": [10, 1], "x": 15, "y": 1},
-                {"matrix": [11, 1], "x": 16, "y": 1.13},
-                {"matrix": [12, 1], "x": 17, "y": 1.38},
-                {"matrix": [13, 1], "x": 18, "y": 1.38, "w": 1.5},
-
-                {"matrix": [6, 2], "x": 0, "y": 2.38, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.5, "y": 2.38},
-                {"matrix": [4, 2], "x": 2.5, "y": 2.13},
-                {"matrix": [3, 2], "x": 3.5, "y": 2},
-                {"matrix": [2, 2], "x": 4.5, "y": 2.13},
-                {"matrix": [1, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [0, 2], "x": 6.5, "y": 1.75, "h": 1.5},
-                {"matrix": [0, 3], "x": 8.25, "y": 2.75},
-
-                {"matrix": [7, 3], "x": 10.25, "y": 2.75},
-                {"matrix": [7, 2], "x": 12, "y": 1.75, "h": 1.5},
-                {"matrix": [8, 2], "x": 13, "y": 2.25},
-                {"matrix": [9, 2], "x": 14, "y": 2.13},
-                {"matrix": [10, 2], "x": 15, "y": 2},
-                {"matrix": [11, 2], "x": 16, "y": 2.13},
-                {"matrix": [12, 2], "x": 17, "y": 2.38},
-                {"matrix": [13, 2], "x": 18, "y": 2.38, "w": 1.5},
-
-                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 6, "y": 3.63},
-                {"matrix": [2, 3], "x": 7.25, "y": 3.75, "h": 2},
-                {"matrix": [1, 3], "x": 8.25, "y": 3.75, "h": 2},
-
-                {"matrix": [8, 3], "x": 10.25, "y": 3.75, "h": 2},
-                {"matrix": [9, 3], "x": 11.25, "y": 3.75, "h": 2},
-                {"matrix": [10, 3], "x": 12.5, "y": 3.63},
-                {"matrix": [11, 3], "x": 13.75, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/gergo/keyboard.json b/keyboards/gboards/gergo/keyboard.json
new file mode 100644
index 00000000000..e576ac8012e
--- /dev/null
+++ b/keyboards/gboards/gergo/keyboard.json
@@ -0,0 +1,95 @@
+{
+    "keyboard_name": "Gergo",
+    "manufacturer": "g Heavy Industries",
+    "url": "http://gboards.ca",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1307",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
+    "bootmagic": {
+        "matrix": [13, 2]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "tapping": {
+        "toggle": 1
+    },
+    "layout_aliases": {
+        "LAYOUT_gergo": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [6, 0], "x": 0, "y": 0.38, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 0.38},
+                {"matrix": [4, 0], "x": 2.5, "y": 0.13},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [2, 0], "x": 4.5, "y": 0.13},
+                {"matrix": [1, 0], "x": 5.5, "y": 0.25},
+
+                {"matrix": [8, 0], "x": 13, "y": 0.25},
+                {"matrix": [9, 0], "x": 14, "y": 0.13},
+                {"matrix": [10, 0], "x": 15, "y": 0},
+                {"matrix": [11, 0], "x": 16, "y": 0.13},
+                {"matrix": [12, 0], "x": 17, "y": 0.38},
+                {"matrix": [13, 0], "x": 18, "y": 0.38, "w": 1.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 1.38, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 1.38},
+                {"matrix": [4, 1], "x": 2.5, "y": 1.13},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 1], "x": 4.5, "y": 1.13},
+                {"matrix": [1, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [0, 1], "x": 6.5, "y": 0.25, "h": 1.5},
+
+                {"matrix": [7, 1], "x": 12, "y": 0.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 13, "y": 1.25},
+                {"matrix": [9, 1], "x": 14, "y": 1.13},
+                {"matrix": [10, 1], "x": 15, "y": 1},
+                {"matrix": [11, 1], "x": 16, "y": 1.13},
+                {"matrix": [12, 1], "x": 17, "y": 1.38},
+                {"matrix": [13, 1], "x": 18, "y": 1.38, "w": 1.5},
+
+                {"matrix": [6, 2], "x": 0, "y": 2.38, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 2.38},
+                {"matrix": [4, 2], "x": 2.5, "y": 2.13},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2.13},
+                {"matrix": [1, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [0, 2], "x": 6.5, "y": 1.75, "h": 1.5},
+                {"matrix": [0, 3], "x": 8.25, "y": 2.75},
+
+                {"matrix": [7, 3], "x": 10.25, "y": 2.75},
+                {"matrix": [7, 2], "x": 12, "y": 1.75, "h": 1.5},
+                {"matrix": [8, 2], "x": 13, "y": 2.25},
+                {"matrix": [9, 2], "x": 14, "y": 2.13},
+                {"matrix": [10, 2], "x": 15, "y": 2},
+                {"matrix": [11, 2], "x": 16, "y": 2.13},
+                {"matrix": [12, 2], "x": 17, "y": 2.38},
+                {"matrix": [13, 2], "x": 18, "y": 2.38, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 6, "y": 3.63},
+                {"matrix": [2, 3], "x": 7.25, "y": 3.75, "h": 2},
+                {"matrix": [1, 3], "x": 8.25, "y": 3.75, "h": 2},
+
+                {"matrix": [8, 3], "x": 10.25, "y": 3.75, "h": 2},
+                {"matrix": [9, 3], "x": 11.25, "y": 3.75, "h": 2},
+                {"matrix": [10, 3], "x": 12.5, "y": 3.63},
+                {"matrix": [11, 3], "x": 13.75, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk
index d789b349da8..77c632bc1ca 100644
--- a/keyboards/gboards/gergo/rules.mk
+++ b/keyboards/gboards/gergo/rules.mk
@@ -2,10 +2,6 @@
 #   change yes to no to disable
 #
 CUSTOM_MATRIX 		= yes
-EXTRAKEY_ENABLE		= yes
-CONSOLE_ENABLE  	= yes
-COMMAND_ENABLE		= yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
deleted file mode 100644
index c5f6be47509..00000000000
--- a/keyboards/gboards/gergoplex/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "keyboard_name": "GergoPlex",
-    "manufacturer": "g Heavy Industries",
-    "url": "",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0x6B0A",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "build": {
-        "debounce_type": "sym_eager_pr"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [4, 0], "x": 0, "y": 0.25},
-                {"matrix": [3, 0], "x": 1, "y": 0.125},
-                {"matrix": [2, 0], "x": 2, "y": 0},
-                {"matrix": [1, 0], "x": 3, "y": 0.125},
-                {"matrix": [0, 0], "x": 4, "y": 0.375},
-
-                {"matrix": [5, 0], "x": 8, "y": 0.375},
-                {"matrix": [6, 0], "x": 9, "y": 0.125},
-                {"matrix": [7, 0], "x": 10, "y": 0},
-                {"matrix": [8, 0], "x": 11, "y": 0.125},
-                {"matrix": [9, 0], "x": 12, "y": 0.25},
-
-                {"matrix": [4, 1], "x": 0, "y": 1.25},
-                {"matrix": [3, 1], "x": 1, "y": 1.125},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [1, 1], "x": 3, "y": 1.125},
-                {"matrix": [0, 1], "x": 4, "y": 1.375},
-
-                {"matrix": [5, 1], "x": 8, "y": 1.375},
-                {"matrix": [6, 1], "x": 9, "y": 1.125},
-                {"matrix": [7, 1], "x": 10, "y": 1},
-                {"matrix": [8, 1], "x": 11, "y": 1.125},
-                {"matrix": [9, 1], "x": 12, "y": 1.25},
-
-                {"matrix": [4, 2], "x": 0, "y": 2.25},
-                {"matrix": [3, 2], "x": 1, "y": 2.125},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [1, 2], "x": 3, "y": 2.125},
-                {"matrix": [0, 2], "x": 4, "y": 2.375},
-
-                {"matrix": [5, 2], "x": 8, "y": 2.375},
-                {"matrix": [6, 2], "x": 9, "y": 2.125},
-                {"matrix": [7, 2], "x": 10, "y": 2},
-                {"matrix": [8, 2], "x": 11, "y": 2.125},
-                {"matrix": [9, 2], "x": 12, "y": 2.25},
-
-                {"matrix": [3, 3], "x": 2, "y": 3.5},
-                {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5},
-                {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2},
-
-                {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2},
-                {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5},
-                {"matrix": [8, 3], "x": 10, "y": 3.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/gergoplex/keyboard.json b/keyboards/gboards/gergoplex/keyboard.json
new file mode 100644
index 00000000000..cf1e4513923
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keyboard.json
@@ -0,0 +1,73 @@
+{
+    "keyboard_name": "GergoPlex",
+    "manufacturer": "g Heavy Industries",
+    "url": "",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0x6B0A",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0.25},
+                {"matrix": [3, 0], "x": 1, "y": 0.125},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [1, 0], "x": 3, "y": 0.125},
+                {"matrix": [0, 0], "x": 4, "y": 0.375},
+
+                {"matrix": [5, 0], "x": 8, "y": 0.375},
+                {"matrix": [6, 0], "x": 9, "y": 0.125},
+                {"matrix": [7, 0], "x": 10, "y": 0},
+                {"matrix": [8, 0], "x": 11, "y": 0.125},
+                {"matrix": [9, 0], "x": 12, "y": 0.25},
+
+                {"matrix": [4, 1], "x": 0, "y": 1.25},
+                {"matrix": [3, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [1, 1], "x": 3, "y": 1.125},
+                {"matrix": [0, 1], "x": 4, "y": 1.375},
+
+                {"matrix": [5, 1], "x": 8, "y": 1.375},
+                {"matrix": [6, 1], "x": 9, "y": 1.125},
+                {"matrix": [7, 1], "x": 10, "y": 1},
+                {"matrix": [8, 1], "x": 11, "y": 1.125},
+                {"matrix": [9, 1], "x": 12, "y": 1.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 2.25},
+                {"matrix": [3, 2], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 3, "y": 2.125},
+                {"matrix": [0, 2], "x": 4, "y": 2.375},
+
+                {"matrix": [5, 2], "x": 8, "y": 2.375},
+                {"matrix": [6, 2], "x": 9, "y": 2.125},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [8, 2], "x": 11, "y": 2.125},
+                {"matrix": [9, 2], "x": 12, "y": 2.25},
+
+                {"matrix": [3, 3], "x": 2, "y": 3.5},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5},
+                {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2},
+
+                {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2},
+                {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5},
+                {"matrix": [8, 3], "x": 10, "y": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk
index 9846c64771e..6ae3f1122b1 100644
--- a/keyboards/gboards/gergoplex/rules.mk
+++ b/keyboards/gboards/gergoplex/rules.mk
@@ -1,15 +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 = 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 = yes
 
 SRC += matrix.c
diff --git a/keyboards/geistmaschine/macropod/info.json b/keyboards/geistmaschine/macropod/keyboard.json
similarity index 100%
rename from keyboards/geistmaschine/macropod/info.json
rename to keyboards/geistmaschine/macropod/keyboard.json
diff --git a/keyboards/geonworks/ee_at/info.json b/keyboards/geonworks/ee_at/keyboard.json
similarity index 100%
rename from keyboards/geonworks/ee_at/info.json
rename to keyboards/geonworks/ee_at/keyboard.json
diff --git a/keyboards/geonworks/w1_at/info.json b/keyboards/geonworks/w1_at/keyboard.json
similarity index 100%
rename from keyboards/geonworks/w1_at/info.json
rename to keyboards/geonworks/w1_at/keyboard.json
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
deleted file mode 100644
index 953e0bebc37..00000000000
--- a/keyboards/giabalanai/info.json
+++ /dev/null
@@ -1,316 +0,0 @@
-{
-    "keyboard_name": "giabalanai",
-    "manufacturer": "3araht",
-    "url": "https://github.com/3araht",
-    "maintainer": "3araht",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xF4B0",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations" :{
-            "gradient_up_down": true,
-            "rainbow_moving_chevron": true,
-            "hue_breathing": true,
-            "solid_reactive": true,
-            "multisplash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 50
-    },
-    "rgblight": {
-        "led_count": 123,
-        "max_brightness": 80,
-        "led_map": [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 97, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48]
-    },
-    "matrix_pins": {
-        "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],
-        "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "midi": true,
-        "extrakey": true,
-        "encoder": true,
-        "bootmagic": false,
-        "console": false,
-        "mousekey": false,
-        "nkro": false
-    },
-    "encoder": {
-        "rotary": []
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "B4", "pin_b": "B6"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "C7", "B7", "F1"],
-                "rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
-            }
-        }
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [2, 0], "x": 2, "y": 0},
-                {"matrix": [3, 0], "x": 3, "y": 0},
-                {"matrix": [4, 0], "x": 4, "y": 0},
-                {"matrix": [5, 0], "x": 5, "y": 0},
-                {"matrix": [5, 5], "x": 6, "y": 0},
-                {"matrix": [4, 5], "x": 7, "y": 0},
-                {"matrix": [3, 5], "x": 8, "y": 0},
-                {"matrix": [2, 5], "x": 9, "y": 0},
-                {"matrix": [1, 5], "x": 10, "y": 0},
-                {"matrix": [0, 5], "x": 11, "y": 0},
-
-                {"matrix": [0, 1], "x": 0.5, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1},
-                {"matrix": [5, 1], "x": 5.5, "y": 1},
-                {"matrix": [5, 6], "x": 6.5, "y": 1},
-                {"matrix": [4, 6], "x": 7.5, "y": 1},
-                {"matrix": [3, 6], "x": 8.5, "y": 1},
-                {"matrix": [2, 6], "x": 9.5, "y": 1},
-                {"matrix": [1, 6], "x": 10.5, "y": 1},
-                {"matrix": [0, 6], "x": 11.5, "y": 1},
-
-                {"matrix": [0, 2], "x": 14.5, "y": 1},
-
-                {"matrix": [1, 2], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [3, 2], "x": 3, "y": 2},
-                {"matrix": [4, 2], "x": 4, "y": 2},
-                {"matrix": [5, 2], "x": 5, "y": 2},
-                {"matrix": [5, 7], "x": 6, "y": 2},
-                {"matrix": [4, 7], "x": 7, "y": 2},
-                {"matrix": [3, 7], "x": 8, "y": 2},
-                {"matrix": [2, 7], "x": 9, "y": 2},
-                {"matrix": [1, 7], "x": 10, "y": 2},
-                {"matrix": [0, 7], "x": 11, "y": 2},
-                {"matrix": [0, 3], "x": 12, "y": 2},
-
-                {"matrix": [1, 3], "x": 15, "y": 2},
-                {"matrix": [2, 3], "x": 16, "y": 2},
-                {"matrix": [3, 3], "x": 17, "y": 2},
-                {"matrix": [4, 3], "x": 18, "y": 2},
-                {"matrix": [5, 3], "x": 19, "y": 2},
-                {"matrix": [5, 8], "x": 20, "y": 2},
-                {"matrix": [4, 8], "x": 21, "y": 2},
-                {"matrix": [3, 8], "x": 22, "y": 2},
-                {"matrix": [2, 8], "x": 23, "y": 2},
-                {"matrix": [1, 8], "x": 24, "y": 2},
-                {"matrix": [0, 8], "x": 25, "y": 2},
-                {"matrix": [0, 4], "x": 26, "y": 2},
-
-                {"matrix": [1, 4], "x": 27.5, "y": 2},
-
-                {"matrix": [2, 4], "x": 1.5, "y": 3},
-                {"matrix": [3, 4], "x": 2.5, "y": 3},
-                {"matrix": [4, 4], "x": 3.5, "y": 3},
-                {"matrix": [5, 4], "x": 4.5, "y": 3},
-                {"matrix": [5, 9], "x": 5.5, "y": 3},
-                {"matrix": [4, 9], "x": 6.5, "y": 3},
-                {"matrix": [3, 9], "x": 7.5, "y": 3},
-                {"matrix": [2, 9], "x": 8.5, "y": 3},
-                {"matrix": [1, 9], "x": 9.5, "y": 3},
-                {"matrix": [0, 9], "x": 10.5, "y": 3},
-                {"matrix": [8, 0], "x": 11.5, "y": 3},
-                {"matrix": [6, 0], "x": 12.5, "y": 3},
-
-                {"matrix": [6, 1], "x": 14.5, "y": 3},
-                {"matrix": [6, 2], "x": 15.5, "y": 3},
-                {"matrix": [6, 3], "x": 16.5, "y": 3},
-                {"matrix": [6, 4], "x": 17.5, "y": 3},
-                {"matrix": [6, 5], "x": 18.5, "y": 3},
-                {"matrix": [6, 6], "x": 19.5, "y": 3},
-                {"matrix": [9, 6], "x": 20.5, "y": 3},
-                {"matrix": [9, 5], "x": 21.5, "y": 3},
-                {"matrix": [9, 4], "x": 22.5, "y": 3},
-                {"matrix": [9, 3], "x": 23.5, "y": 3},
-                {"matrix": [9, 2], "x": 24.5, "y": 3},
-                {"matrix": [9, 1], "x": 25.5, "y": 3},
-                {"matrix": [7, 0], "x": 26.5, "y": 3},
-
-                {"matrix": [7, 1], "x": 2, "y": 4},
-                {"matrix": [7, 2], "x": 3, "y": 4},
-                {"matrix": [7, 3], "x": 4, "y": 4},
-                {"matrix": [7, 4], "x": 5, "y": 4},
-                {"matrix": [7, 5], "x": 6, "y": 4},
-                {"matrix": [7, 6], "x": 7, "y": 4},
-                {"matrix": [10, 6], "x": 8, "y": 4},
-                {"matrix": [10, 5], "x": 9, "y": 4},
-                {"matrix": [10, 4], "x": 10, "y": 4},
-                {"matrix": [10, 3], "x": 11, "y": 4},
-                {"matrix": [10, 2], "x": 12, "y": 4},
-                {"matrix": [10, 1], "x": 13, "y": 4},
-
-                {"matrix": [8, 1], "x": 15, "y": 4},
-                {"matrix": [8, 2], "x": 16, "y": 4},
-                {"matrix": [8, 3], "x": 17, "y": 4},
-                {"matrix": [8, 4], "x": 18, "y": 4},
-                {"matrix": [8, 5], "x": 19, "y": 4},
-                {"matrix": [8, 6], "x": 20, "y": 4},
-                {"matrix": [11, 6], "x": 21, "y": 4},
-                {"matrix": [11, 5], "x": 22, "y": 4},
-                {"matrix": [11, 4], "x": 23, "y": 4},
-                {"matrix": [11, 3], "x": 24, "y": 4},
-                {"matrix": [11, 2], "x": 25, "y": 4},
-                {"matrix": [11, 1], "x": 26, "y": 4}
-            ]
-        },
-        "LAYOUT_giabarinaix2": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [2, 0], "x": 2, "y": 0},
-                {"matrix": [3, 0], "x": 3, "y": 0},
-                {"matrix": [4, 0], "x": 4, "y": 0},
-                {"matrix": [5, 0], "x": 5, "y": 0},
-                {"matrix": [5, 5], "x": 6, "y": 0},
-                {"matrix": [4, 5], "x": 7, "y": 0},
-                {"matrix": [3, 5], "x": 8, "y": 0},
-                {"matrix": [2, 5], "x": 9, "y": 0},
-                {"matrix": [1, 5], "x": 10, "y": 0},
-                {"matrix": [0, 5], "x": 11, "y": 0},
-
-                {"matrix": [0, 1], "x": 0.5, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1},
-                {"matrix": [5, 1], "x": 5.5, "y": 1},
-                {"matrix": [5, 6], "x": 6.5, "y": 1},
-                {"matrix": [4, 6], "x": 7.5, "y": 1},
-                {"matrix": [3, 6], "x": 8.5, "y": 1},
-                {"matrix": [2, 6], "x": 9.5, "y": 1},
-                {"matrix": [1, 6], "x": 10.5, "y": 1},
-                {"matrix": [0, 6], "x": 11.5, "y": 1},
-
-                {"matrix": [0, 2], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 2},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [3, 2], "x": 4, "y": 2},
-                {"matrix": [4, 2], "x": 5, "y": 2},
-                {"matrix": [5, 2], "x": 6, "y": 2},
-                {"matrix": [5, 7], "x": 7, "y": 2},
-                {"matrix": [4, 7], "x": 8, "y": 2},
-                {"matrix": [3, 7], "x": 9, "y": 2},
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [1, 7], "x": 11, "y": 2},
-                {"matrix": [0, 7], "x": 12, "y": 2},
-
-                {"matrix": [0, 3], "x": 1.5, "y": 3},
-                {"matrix": [1, 3], "x": 2.5, "y": 3},
-                {"matrix": [2, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [4, 3], "x": 5.5, "y": 3},
-                {"matrix": [5, 3], "x": 6.5, "y": 3},
-                {"matrix": [5, 8], "x": 7.5, "y": 3},
-                {"matrix": [4, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 8], "x": 9.5, "y": 3},
-                {"matrix": [2, 8], "x": 10.5, "y": 3},
-                {"matrix": [1, 8], "x": 11.5, "y": 3},
-                {"matrix": [0, 8], "x": 12.5, "y": 3},
-
-                {"matrix": [0, 4], "x": 2, "y": 4},
-                {"matrix": [1, 4], "x": 3, "y": 4},
-                {"matrix": [2, 4], "x": 4, "y": 4},
-                {"matrix": [3, 4], "x": 5, "y": 4},
-                {"matrix": [4, 4], "x": 6, "y": 4},
-                {"matrix": [5, 4], "x": 7, "y": 4},
-                {"matrix": [5, 9], "x": 8, "y": 4},
-                {"matrix": [4, 9], "x": 9, "y": 4},
-                {"matrix": [3, 9], "x": 10, "y": 4},
-                {"matrix": [2, 9], "x": 11, "y": 4},
-                {"matrix": [1, 9], "x": 12, "y": 4},
-                {"matrix": [0, 9], "x": 13, "y": 4},
-
-                {"matrix": [6, 9], "x": 0, "y": 6},
-                {"matrix": [7, 9], "x": 1, "y": 6},
-                {"matrix": [8, 9], "x": 2, "y": 6},
-                {"matrix": [9, 9], "x": 3, "y": 6},
-                {"matrix": [10, 9], "x": 4, "y": 6},
-                {"matrix": [11, 9], "x": 5, "y": 6},
-                {"matrix": [11, 4], "x": 6, "y": 6},
-                {"matrix": [10, 4], "x": 7, "y": 6},
-                {"matrix": [9, 4], "x": 8, "y": 6},
-                {"matrix": [8, 4], "x": 9, "y": 6},
-                {"matrix": [7, 4], "x": 10, "y": 6},
-                {"matrix": [6, 4], "x": 11, "y": 6},
-
-                {"matrix": [6, 8], "x": 0.5, "y": 7},
-                {"matrix": [7, 8], "x": 1.5, "y": 7},
-                {"matrix": [8, 8], "x": 2.5, "y": 7},
-                {"matrix": [9, 8], "x": 3.5, "y": 7},
-                {"matrix": [10, 8], "x": 4.5, "y": 7},
-                {"matrix": [11, 8], "x": 5.5, "y": 7},
-                {"matrix": [11, 3], "x": 6.5, "y": 7},
-                {"matrix": [10, 3], "x": 7.5, "y": 7},
-                {"matrix": [9, 3], "x": 8.5, "y": 7},
-                {"matrix": [8, 3], "x": 9.5, "y": 7},
-                {"matrix": [7, 3], "x": 10.5, "y": 7},
-                {"matrix": [6, 3], "x": 11.5, "y": 7},
-
-                {"matrix": [6, 7], "x": 1, "y": 8},
-                {"matrix": [7, 7], "x": 2, "y": 8},
-                {"matrix": [8, 7], "x": 3, "y": 8},
-                {"matrix": [9, 7], "x": 4, "y": 8},
-                {"matrix": [10, 7], "x": 5, "y": 8},
-                {"matrix": [11, 7], "x": 6, "y": 8},
-                {"matrix": [11, 2], "x": 7, "y": 8},
-                {"matrix": [10, 2], "x": 8, "y": 8},
-                {"matrix": [9, 2], "x": 9, "y": 8},
-                {"matrix": [8, 2], "x": 10, "y": 8},
-                {"matrix": [7, 2], "x": 11, "y": 8},
-                {"matrix": [6, 2], "x": 12, "y": 8},
-
-                {"matrix": [6, 6], "x": 1.5, "y": 9},
-                {"matrix": [7, 6], "x": 2.5, "y": 9},
-                {"matrix": [8, 6], "x": 3.5, "y": 9},
-                {"matrix": [9, 6], "x": 4.5, "y": 9},
-                {"matrix": [10, 6], "x": 5.5, "y": 9},
-                {"matrix": [11, 6], "x": 6.5, "y": 9},
-                {"matrix": [11, 1], "x": 7.5, "y": 9},
-                {"matrix": [10, 1], "x": 8.5, "y": 9},
-                {"matrix": [9, 1], "x": 9.5, "y": 9},
-                {"matrix": [8, 1], "x": 10.5, "y": 9},
-                {"matrix": [7, 1], "x": 11.5, "y": 9},
-                {"matrix": [6, 1], "x": 12.5, "y": 9},
-
-                {"matrix": [6, 5], "x": 2, "y": 10},
-                {"matrix": [7, 5], "x": 3, "y": 10},
-                {"matrix": [8, 5], "x": 4, "y": 10},
-                {"matrix": [9, 5], "x": 5, "y": 10},
-                {"matrix": [10, 5], "x": 6, "y": 10},
-                {"matrix": [11, 5], "x": 7, "y": 10},
-                {"matrix": [11, 0], "x": 8, "y": 10},
-                {"matrix": [10, 0], "x": 9, "y": 10},
-                {"matrix": [9, 0], "x": 10, "y": 10},
-                {"matrix": [8, 0], "x": 11, "y": 10},
-                {"matrix": [7, 0], "x": 12, "y": 10},
-                {"matrix": [6, 0], "x": 13, "y": 10}
-            ]
-        }
-    }
-}
diff --git a/keyboards/giabalanai/keyboard.json b/keyboards/giabalanai/keyboard.json
new file mode 100644
index 00000000000..ae5787cec6e
--- /dev/null
+++ b/keyboards/giabalanai/keyboard.json
@@ -0,0 +1,322 @@
+{
+    "keyboard_name": "giabalanai",
+    "manufacturer": "3araht",
+    "url": "https://github.com/3araht",
+    "maintainer": "3araht",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xF4B0",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "animations" :{
+            "gradient_up_down": true,
+            "rainbow_moving_chevron": true,
+            "hue_breathing": true,
+            "solid_reactive": true,
+            "multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 50
+    },
+    "rgblight": {
+        "led_count": 123,
+        "max_brightness": 80,
+        "led_map": [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 97, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48]
+    },
+    "matrix_pins": {
+        "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],
+        "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "midi": true,
+        "extrakey": true,
+        "encoder": true,
+        "bootmagic": false,
+        "console": false,
+        "mousekey": false,
+        "nkro": false,
+        "command": false,
+        "backlight": false,
+        "rgb_matrix": false
+    },
+    "build": {
+        "lto": true
+    },
+    "encoder": {
+        "rotary": []
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B4", "pin_b": "B6"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "C7", "B7", "F1"],
+                "rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
+            }
+        }
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+                {"matrix": [4, 0], "x": 4, "y": 0},
+                {"matrix": [5, 0], "x": 5, "y": 0},
+                {"matrix": [5, 5], "x": 6, "y": 0},
+                {"matrix": [4, 5], "x": 7, "y": 0},
+                {"matrix": [3, 5], "x": 8, "y": 0},
+                {"matrix": [2, 5], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+
+                {"matrix": [0, 1], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1},
+                {"matrix": [5, 1], "x": 5.5, "y": 1},
+                {"matrix": [5, 6], "x": 6.5, "y": 1},
+                {"matrix": [4, 6], "x": 7.5, "y": 1},
+                {"matrix": [3, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 6], "x": 9.5, "y": 1},
+                {"matrix": [1, 6], "x": 10.5, "y": 1},
+                {"matrix": [0, 6], "x": 11.5, "y": 1},
+
+                {"matrix": [0, 2], "x": 14.5, "y": 1},
+
+                {"matrix": [1, 2], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [3, 2], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [5, 7], "x": 6, "y": 2},
+                {"matrix": [4, 7], "x": 7, "y": 2},
+                {"matrix": [3, 7], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [1, 7], "x": 10, "y": 2},
+                {"matrix": [0, 7], "x": 11, "y": 2},
+                {"matrix": [0, 3], "x": 12, "y": 2},
+
+                {"matrix": [1, 3], "x": 15, "y": 2},
+                {"matrix": [2, 3], "x": 16, "y": 2},
+                {"matrix": [3, 3], "x": 17, "y": 2},
+                {"matrix": [4, 3], "x": 18, "y": 2},
+                {"matrix": [5, 3], "x": 19, "y": 2},
+                {"matrix": [5, 8], "x": 20, "y": 2},
+                {"matrix": [4, 8], "x": 21, "y": 2},
+                {"matrix": [3, 8], "x": 22, "y": 2},
+                {"matrix": [2, 8], "x": 23, "y": 2},
+                {"matrix": [1, 8], "x": 24, "y": 2},
+                {"matrix": [0, 8], "x": 25, "y": 2},
+                {"matrix": [0, 4], "x": 26, "y": 2},
+
+                {"matrix": [1, 4], "x": 27.5, "y": 2},
+
+                {"matrix": [2, 4], "x": 1.5, "y": 3},
+                {"matrix": [3, 4], "x": 2.5, "y": 3},
+                {"matrix": [4, 4], "x": 3.5, "y": 3},
+                {"matrix": [5, 4], "x": 4.5, "y": 3},
+                {"matrix": [5, 9], "x": 5.5, "y": 3},
+                {"matrix": [4, 9], "x": 6.5, "y": 3},
+                {"matrix": [3, 9], "x": 7.5, "y": 3},
+                {"matrix": [2, 9], "x": 8.5, "y": 3},
+                {"matrix": [1, 9], "x": 9.5, "y": 3},
+                {"matrix": [0, 9], "x": 10.5, "y": 3},
+                {"matrix": [8, 0], "x": 11.5, "y": 3},
+                {"matrix": [6, 0], "x": 12.5, "y": 3},
+
+                {"matrix": [6, 1], "x": 14.5, "y": 3},
+                {"matrix": [6, 2], "x": 15.5, "y": 3},
+                {"matrix": [6, 3], "x": 16.5, "y": 3},
+                {"matrix": [6, 4], "x": 17.5, "y": 3},
+                {"matrix": [6, 5], "x": 18.5, "y": 3},
+                {"matrix": [6, 6], "x": 19.5, "y": 3},
+                {"matrix": [9, 6], "x": 20.5, "y": 3},
+                {"matrix": [9, 5], "x": 21.5, "y": 3},
+                {"matrix": [9, 4], "x": 22.5, "y": 3},
+                {"matrix": [9, 3], "x": 23.5, "y": 3},
+                {"matrix": [9, 2], "x": 24.5, "y": 3},
+                {"matrix": [9, 1], "x": 25.5, "y": 3},
+                {"matrix": [7, 0], "x": 26.5, "y": 3},
+
+                {"matrix": [7, 1], "x": 2, "y": 4},
+                {"matrix": [7, 2], "x": 3, "y": 4},
+                {"matrix": [7, 3], "x": 4, "y": 4},
+                {"matrix": [7, 4], "x": 5, "y": 4},
+                {"matrix": [7, 5], "x": 6, "y": 4},
+                {"matrix": [7, 6], "x": 7, "y": 4},
+                {"matrix": [10, 6], "x": 8, "y": 4},
+                {"matrix": [10, 5], "x": 9, "y": 4},
+                {"matrix": [10, 4], "x": 10, "y": 4},
+                {"matrix": [10, 3], "x": 11, "y": 4},
+                {"matrix": [10, 2], "x": 12, "y": 4},
+                {"matrix": [10, 1], "x": 13, "y": 4},
+
+                {"matrix": [8, 1], "x": 15, "y": 4},
+                {"matrix": [8, 2], "x": 16, "y": 4},
+                {"matrix": [8, 3], "x": 17, "y": 4},
+                {"matrix": [8, 4], "x": 18, "y": 4},
+                {"matrix": [8, 5], "x": 19, "y": 4},
+                {"matrix": [8, 6], "x": 20, "y": 4},
+                {"matrix": [11, 6], "x": 21, "y": 4},
+                {"matrix": [11, 5], "x": 22, "y": 4},
+                {"matrix": [11, 4], "x": 23, "y": 4},
+                {"matrix": [11, 3], "x": 24, "y": 4},
+                {"matrix": [11, 2], "x": 25, "y": 4},
+                {"matrix": [11, 1], "x": 26, "y": 4}
+            ]
+        },
+        "LAYOUT_giabarinaix2": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+                {"matrix": [4, 0], "x": 4, "y": 0},
+                {"matrix": [5, 0], "x": 5, "y": 0},
+                {"matrix": [5, 5], "x": 6, "y": 0},
+                {"matrix": [4, 5], "x": 7, "y": 0},
+                {"matrix": [3, 5], "x": 8, "y": 0},
+                {"matrix": [2, 5], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+
+                {"matrix": [0, 1], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1},
+                {"matrix": [5, 1], "x": 5.5, "y": 1},
+                {"matrix": [5, 6], "x": 6.5, "y": 1},
+                {"matrix": [4, 6], "x": 7.5, "y": 1},
+                {"matrix": [3, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 6], "x": 9.5, "y": 1},
+                {"matrix": [1, 6], "x": 10.5, "y": 1},
+                {"matrix": [0, 6], "x": 11.5, "y": 1},
+
+                {"matrix": [0, 2], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [3, 2], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [5, 7], "x": 7, "y": 2},
+                {"matrix": [4, 7], "x": 8, "y": 2},
+                {"matrix": [3, 7], "x": 9, "y": 2},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [1, 7], "x": 11, "y": 2},
+                {"matrix": [0, 7], "x": 12, "y": 2},
+
+                {"matrix": [0, 3], "x": 1.5, "y": 3},
+                {"matrix": [1, 3], "x": 2.5, "y": 3},
+                {"matrix": [2, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [4, 3], "x": 5.5, "y": 3},
+                {"matrix": [5, 3], "x": 6.5, "y": 3},
+                {"matrix": [5, 8], "x": 7.5, "y": 3},
+                {"matrix": [4, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [2, 8], "x": 10.5, "y": 3},
+                {"matrix": [1, 8], "x": 11.5, "y": 3},
+                {"matrix": [0, 8], "x": 12.5, "y": 3},
+
+                {"matrix": [0, 4], "x": 2, "y": 4},
+                {"matrix": [1, 4], "x": 3, "y": 4},
+                {"matrix": [2, 4], "x": 4, "y": 4},
+                {"matrix": [3, 4], "x": 5, "y": 4},
+                {"matrix": [4, 4], "x": 6, "y": 4},
+                {"matrix": [5, 4], "x": 7, "y": 4},
+                {"matrix": [5, 9], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [3, 9], "x": 10, "y": 4},
+                {"matrix": [2, 9], "x": 11, "y": 4},
+                {"matrix": [1, 9], "x": 12, "y": 4},
+                {"matrix": [0, 9], "x": 13, "y": 4},
+
+                {"matrix": [6, 9], "x": 0, "y": 6},
+                {"matrix": [7, 9], "x": 1, "y": 6},
+                {"matrix": [8, 9], "x": 2, "y": 6},
+                {"matrix": [9, 9], "x": 3, "y": 6},
+                {"matrix": [10, 9], "x": 4, "y": 6},
+                {"matrix": [11, 9], "x": 5, "y": 6},
+                {"matrix": [11, 4], "x": 6, "y": 6},
+                {"matrix": [10, 4], "x": 7, "y": 6},
+                {"matrix": [9, 4], "x": 8, "y": 6},
+                {"matrix": [8, 4], "x": 9, "y": 6},
+                {"matrix": [7, 4], "x": 10, "y": 6},
+                {"matrix": [6, 4], "x": 11, "y": 6},
+
+                {"matrix": [6, 8], "x": 0.5, "y": 7},
+                {"matrix": [7, 8], "x": 1.5, "y": 7},
+                {"matrix": [8, 8], "x": 2.5, "y": 7},
+                {"matrix": [9, 8], "x": 3.5, "y": 7},
+                {"matrix": [10, 8], "x": 4.5, "y": 7},
+                {"matrix": [11, 8], "x": 5.5, "y": 7},
+                {"matrix": [11, 3], "x": 6.5, "y": 7},
+                {"matrix": [10, 3], "x": 7.5, "y": 7},
+                {"matrix": [9, 3], "x": 8.5, "y": 7},
+                {"matrix": [8, 3], "x": 9.5, "y": 7},
+                {"matrix": [7, 3], "x": 10.5, "y": 7},
+                {"matrix": [6, 3], "x": 11.5, "y": 7},
+
+                {"matrix": [6, 7], "x": 1, "y": 8},
+                {"matrix": [7, 7], "x": 2, "y": 8},
+                {"matrix": [8, 7], "x": 3, "y": 8},
+                {"matrix": [9, 7], "x": 4, "y": 8},
+                {"matrix": [10, 7], "x": 5, "y": 8},
+                {"matrix": [11, 7], "x": 6, "y": 8},
+                {"matrix": [11, 2], "x": 7, "y": 8},
+                {"matrix": [10, 2], "x": 8, "y": 8},
+                {"matrix": [9, 2], "x": 9, "y": 8},
+                {"matrix": [8, 2], "x": 10, "y": 8},
+                {"matrix": [7, 2], "x": 11, "y": 8},
+                {"matrix": [6, 2], "x": 12, "y": 8},
+
+                {"matrix": [6, 6], "x": 1.5, "y": 9},
+                {"matrix": [7, 6], "x": 2.5, "y": 9},
+                {"matrix": [8, 6], "x": 3.5, "y": 9},
+                {"matrix": [9, 6], "x": 4.5, "y": 9},
+                {"matrix": [10, 6], "x": 5.5, "y": 9},
+                {"matrix": [11, 6], "x": 6.5, "y": 9},
+                {"matrix": [11, 1], "x": 7.5, "y": 9},
+                {"matrix": [10, 1], "x": 8.5, "y": 9},
+                {"matrix": [9, 1], "x": 9.5, "y": 9},
+                {"matrix": [8, 1], "x": 10.5, "y": 9},
+                {"matrix": [7, 1], "x": 11.5, "y": 9},
+                {"matrix": [6, 1], "x": 12.5, "y": 9},
+
+                {"matrix": [6, 5], "x": 2, "y": 10},
+                {"matrix": [7, 5], "x": 3, "y": 10},
+                {"matrix": [8, 5], "x": 4, "y": 10},
+                {"matrix": [9, 5], "x": 5, "y": 10},
+                {"matrix": [10, 5], "x": 6, "y": 10},
+                {"matrix": [11, 5], "x": 7, "y": 10},
+                {"matrix": [11, 0], "x": 8, "y": 10},
+                {"matrix": [10, 0], "x": 9, "y": 10},
+                {"matrix": [9, 0], "x": 10, "y": 10},
+                {"matrix": [8, 0], "x": 11, "y": 10},
+                {"matrix": [7, 0], "x": 12, "y": 10},
+                {"matrix": [6, 0], "x": 13, "y": 10}
+            ]
+        }
+    }
+}
diff --git a/keyboards/giabalanai/rules.mk b/keyboards/giabalanai/rules.mk
deleted file mode 100644
index 90ba252d264..00000000000
--- a/keyboards/giabalanai/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-COMMAND_ENABLE = no         # Commands for debug and configuration
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-# RGB_MATRIX_ENABLE is not suitable for giabalanai keyboard on the right side (there are dulpicate keys).
-RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-
-LTO_ENABLE = yes
diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json
deleted file mode 100644
index bc9b1cacfad..00000000000
--- a/keyboards/gl516/a52gl/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "keyboard_name": "a52gl",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xE8D1",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-                {"matrix": [4, 0], "x": 8.75, "y": 0},
-                {"matrix": [4, 1], "x": 9.75, "y": 0},
-                {"matrix": [4, 2], "x": 10.75, "y": 0},
-                {"matrix": [4, 3], "x": 12, "y": 0},
-                {"matrix": [4, 4], "x": 13, "y": 0},
-                {"matrix": [4, 5], "x": 14, "y": 0},
-                {"matrix": [4, 6], "x": 15, "y": 0, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.52, "y": 1},
-                {"matrix": [1, 3], "x": 3.52, "y": 1},
-                {"matrix": [1, 4], "x": 4.52, "y": 1},
-                {"matrix": [1, 5], "x": 5.52, "y": 1},
-
-                {"matrix": [1, 6], "x": 8, "y": 1},
-                {"matrix": [5, 0], "x": 9, "y": 1},
-                {"matrix": [5, 1], "x": 10, "y": 1},
-                {"matrix": [5, 2], "x": 11, "y": 1},
-                {"matrix": [5, 3], "x": 12.25, "y": 1},
-                {"matrix": [5, 4], "x": 13.25, "y": 1},
-                {"matrix": [5, 5], "x": 14.25, "y": 1, "w": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 3.05, "y": 2},
-                {"matrix": [2, 3], "x": 4.05, "y": 2},
-                {"matrix": [2, 4], "x": 5.05, "y": 2},
-                {"matrix": [2, 5], "x": 6.05, "y": 2},
-
-                {"matrix": [2, 6], "x": 7.5, "y": 2},
-                {"matrix": [6, 0], "x": 8.5, "y": 2},
-                {"matrix": [6, 1], "x": 9.5, "y": 2},
-                {"matrix": [6, 2], "x": 10.5, "y": 2},
-                {"matrix": [6, 3], "x": 12, "y": 2},
-                {"matrix": [6, 4], "x": 13, "y": 2},
-
-                {"matrix": [6, 5], "x": 14.25, "y": 2.25},
-
-                {"matrix": [6, 6], "x": 15.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 3.05, "y": 3},
-                {"matrix": [3, 4], "x": 4.05, "y": 3, "w": 2},
-                {"matrix": [3, 5], "x": 6.05, "y": 3},
-
-                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 2.25},
-                {"matrix": [7, 1], "x": 9.75, "y": 3, "w": 1.25},
-                {"matrix": [7, 3], "x": 12, "y": 3},
-
-                {"matrix": [7, 4], "x": 13.25, "y": 3.25},
-                {"matrix": [7, 5], "x": 14.25, "y": 3.25},
-                {"matrix": [7, 6], "x": 15.25, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gl516/a52gl/keyboard.json b/keyboards/gl516/a52gl/keyboard.json
new file mode 100644
index 00000000000..54fbce6bdad
--- /dev/null
+++ b/keyboards/gl516/a52gl/keyboard.json
@@ -0,0 +1,86 @@
+{
+    "keyboard_name": "a52gl",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8D1",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+                {"matrix": [4, 0], "x": 8.75, "y": 0},
+                {"matrix": [4, 1], "x": 9.75, "y": 0},
+                {"matrix": [4, 2], "x": 10.75, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0},
+                {"matrix": [4, 5], "x": 14, "y": 0},
+                {"matrix": [4, 6], "x": 15, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.52, "y": 1},
+                {"matrix": [1, 3], "x": 3.52, "y": 1},
+                {"matrix": [1, 4], "x": 4.52, "y": 1},
+                {"matrix": [1, 5], "x": 5.52, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [5, 0], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12.25, "y": 1},
+                {"matrix": [5, 4], "x": 13.25, "y": 1},
+                {"matrix": [5, 5], "x": 14.25, "y": 1, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 3.05, "y": 2},
+                {"matrix": [2, 3], "x": 4.05, "y": 2},
+                {"matrix": [2, 4], "x": 5.05, "y": 2},
+                {"matrix": [2, 5], "x": 6.05, "y": 2},
+
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+                {"matrix": [6, 0], "x": 8.5, "y": 2},
+                {"matrix": [6, 1], "x": 9.5, "y": 2},
+                {"matrix": [6, 2], "x": 10.5, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 4], "x": 13, "y": 2},
+
+                {"matrix": [6, 5], "x": 14.25, "y": 2.25},
+
+                {"matrix": [6, 6], "x": 15.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 3.05, "y": 3},
+                {"matrix": [3, 4], "x": 4.05, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 6.05, "y": 3},
+
+                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 1], "x": 9.75, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 12, "y": 3},
+
+                {"matrix": [7, 4], "x": 13.25, "y": 3.25},
+                {"matrix": [7, 5], "x": 14.25, "y": 3.25},
+                {"matrix": [7, 6], "x": 15.25, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/a52gl/rules.mk b/keyboards/gl516/a52gl/rules.mk
index 109f8bc976d..179d02c3c68 100644
--- a/keyboards/gl516/a52gl/rules.mk
+++ b/keyboards/gl516/a52gl/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
\ No newline at end of file
+SRC += matrix.c
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
deleted file mode 100644
index fa78788e666..00000000000
--- a/keyboards/gl516/j73gl/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "keyboard_name": "j73gl",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xE8D0",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 73,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-                {"matrix": [5, 6], "x": 13, "y": 0},
-                {"matrix": [6, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 7], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [7, 7], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 5], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 6], "x": 14, "y": 3},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4},
-                {"matrix": [4, 6], "x": 6.75, "y": 4},
-                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9, "y": 4},
-                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 5], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gl516/j73gl/keyboard.json b/keyboards/gl516/j73gl/keyboard.json
new file mode 100644
index 00000000000..b252363f700
--- /dev/null
+++ b/keyboards/gl516/j73gl/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "j73gl",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8D0",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 73,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 7], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 7], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 14, "y": 3},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4},
+                {"matrix": [4, 6], "x": 6.75, "y": 4},
+                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9, "y": 4},
+                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 5], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/j73gl/rules.mk b/keyboards/gl516/j73gl/rules.mk
index 3ea771b6701..179d02c3c68 100644
--- a/keyboards/gl516/j73gl/rules.mk
+++ b/keyboards/gl516/j73gl/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
\ No newline at end of file
+SRC += matrix.c
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
deleted file mode 100644
index c5abdd45428..00000000000
--- a/keyboards/gl516/n51gl/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "n51gl",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xE8CF",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 15,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D7", "pin_b": "E6", "resolution": 3}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-
-                {"matrix": [4, 0], "x": 9.25, "y": 0},
-                {"matrix": [4, 1], "x": 10.25, "y": 0},
-                {"matrix": [4, 2], "x": 11.25, "y": 0},
-                {"matrix": [4, 3], "x": 12.25, "y": 0},
-                {"matrix": [4, 4], "x": 13.25, "y": 0},
-                {"matrix": [4, 5], "x": 14.25, "y": 0},
-                {"matrix": [4, 6], "x": 15.25, "y": 0},
-
-                {"matrix": [1, 1], "x": 0.25, "y": 1, "w": 1.75},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-
-                {"matrix": [5, 0], "x": 9.25, "y": 1},
-                {"matrix": [5, 1], "x": 10.25, "y": 1},
-                {"matrix": [5, 2], "x": 11.25, "y": 1},
-                {"matrix": [5, 3], "x": 12.25, "y": 1},
-                {"matrix": [5, 4], "x": 13.5, "y": 1},
-                {"matrix": [5, 5], "x": 14.5, "y": 1},
-                {"matrix": [5, 6], "x": 15.5, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-
-                {"matrix": [2, 0], "x": 7.75, "y": 2},
-
-                {"matrix": [6, 0], "x": 9.25, "y": 2},
-                {"matrix": [6, 1], "x": 10.25, "y": 2},
-                {"matrix": [6, 2], "x": 11.25, "y": 2},
-                {"matrix": [6, 3], "x": 12.25, "y": 2},
-                {"matrix": [6, 4], "x": 13.75, "y": 2},
-                {"matrix": [6, 5], "x": 14.75, "y": 2},
-                {"matrix": [6, 6], "x": 15.75, "y": 2},
-
-                {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 4], "x": 4.125, "y": 3, "w": 1.25},
-                {"matrix": [3, 5], "x": 5.375, "y": 3, "w": 1.25},
-                {"matrix": [3, 6], "x": 6.625, "y": 3},
-
-                {"matrix": [7, 0], "x": 8.875, "y": 3},
-                {"matrix": [7, 1], "x": 9.875, "y": 3, "w": 1.25},
-                {"matrix": [7, 2], "x": 11.125, "y": 3, "w": 1.25},
-
-                {"matrix": [7, 4], "x": 13.75, "y": 3},
-                {"matrix": [7, 5], "x": 14.75, "y": 3},
-                {"matrix": [7, 6], "x": 15.75, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gl516/n51gl/keyboard.json b/keyboards/gl516/n51gl/keyboard.json
new file mode 100644
index 00000000000..0e54ee52a45
--- /dev/null
+++ b/keyboards/gl516/n51gl/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "n51gl",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8CF",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 15,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D7", "pin_b": "E6", "resolution": 3}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"matrix": [4, 0], "x": 9.25, "y": 0},
+                {"matrix": [4, 1], "x": 10.25, "y": 0},
+                {"matrix": [4, 2], "x": 11.25, "y": 0},
+                {"matrix": [4, 3], "x": 12.25, "y": 0},
+                {"matrix": [4, 4], "x": 13.25, "y": 0},
+                {"matrix": [4, 5], "x": 14.25, "y": 0},
+                {"matrix": [4, 6], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 1], "x": 0.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+
+                {"matrix": [5, 0], "x": 9.25, "y": 1},
+                {"matrix": [5, 1], "x": 10.25, "y": 1},
+                {"matrix": [5, 2], "x": 11.25, "y": 1},
+                {"matrix": [5, 3], "x": 12.25, "y": 1},
+                {"matrix": [5, 4], "x": 13.5, "y": 1},
+                {"matrix": [5, 5], "x": 14.5, "y": 1},
+                {"matrix": [5, 6], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+                {"matrix": [2, 0], "x": 7.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 9.25, "y": 2},
+                {"matrix": [6, 1], "x": 10.25, "y": 2},
+                {"matrix": [6, 2], "x": 11.25, "y": 2},
+                {"matrix": [6, 3], "x": 12.25, "y": 2},
+                {"matrix": [6, 4], "x": 13.75, "y": 2},
+                {"matrix": [6, 5], "x": 14.75, "y": 2},
+                {"matrix": [6, 6], "x": 15.75, "y": 2},
+
+                {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.125, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 5.375, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 6.625, "y": 3},
+
+                {"matrix": [7, 0], "x": 8.875, "y": 3},
+                {"matrix": [7, 1], "x": 9.875, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 11.125, "y": 3, "w": 1.25},
+
+                {"matrix": [7, 4], "x": 13.75, "y": 3},
+                {"matrix": [7, 5], "x": 14.75, "y": 3},
+                {"matrix": [7, 6], "x": 15.75, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/n51gl/rules.mk b/keyboards/gl516/n51gl/rules.mk
index c5b4f3e3764..179d02c3c68 100644
--- a/keyboards/gl516/n51gl/rules.mk
+++ b/keyboards/gl516/n51gl/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
-ENCODER_ENABLE = yes
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
\ No newline at end of file
+SRC += matrix.c
diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/info.json
deleted file mode 100644
index ea49dabbca4..00000000000
--- a/keyboards/glenpickle/chimera_ergo/info.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "keyboard_name": "Chimera Ergo",
-  "manufacturer": "Unknown",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [0, 5], "x": 1, "y": 0.75},
-        {"matrix": [2, 2], "x": 2, "y": 0.25},
-        {"matrix": [4, 2], "x": 3, "y": 0},
-        {"matrix": [3, 3], "x": 4, "y": 0.25},
-        {"matrix": [3, 4], "x": 5, "y": 0.5},
-
-        {"matrix": [3, 7], "x": 7, "y": 0.5},
-        {"matrix": [3, 8], "x": 8, "y": 0.25},
-        {"matrix": [4, 8], "x": 9, "y": 0},
-        {"matrix": [2, 9], "x": 10, "y": 0.25},
-        {"matrix": [4, 9], "x": 11, "y": 0.75},
-        {"matrix": [1, 11], "x": 12, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [3, 1], "x": 1, "y": 1.75},
-        {"matrix": [1, 2], "x": 2, "y": 1.25},
-        {"matrix": [0, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.25},
-        {"matrix": [2, 4], "x": 5, "y": 1.5},
-
-        {"matrix": [2, 7], "x": 7, "y": 1.5},
-        {"matrix": [1, 7], "x": 8, "y": 1.25},
-        {"matrix": [0, 8], "x": 9, "y": 1},
-        {"matrix": [1, 9], "x": 10, "y": 1.25},
-        {"matrix": [3, 10], "x": 11, "y": 1.75},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [2, 1], "x": 1, "y": 2.75},
-        {"matrix": [0, 2], "x": 2, "y": 2.25},
-        {"matrix": [1, 3], "x": 3, "y": 2},
-        {"matrix": [0, 4], "x": 4, "y": 2.25},
-        {"matrix": [4, 0], "x": 5, "y": 2.5},
-
-        {"matrix": [4, 6], "x": 7, "y": 2.5},
-        {"matrix": [0, 7], "x": 8, "y": 2.25},
-        {"matrix": [1, 8], "x": 9, "y": 2},
-        {"matrix": [0, 9], "x": 10, "y": 2.25},
-        {"matrix": [2, 10], "x": 11, "y": 2.75},
-        {"matrix": [3, 11], "x": 12, "y": 3},
-
-        {"matrix": [1, 5], "x": 0, "y": 4},
-        {"matrix": [4, 4], "x": 1, "y": 3.75},
-        {"matrix": [3, 2], "x": 2, "y": 3.25},
-        {"matrix": [2, 3], "x": 3, "y": 3},
-        {"matrix": [4, 3], "x": 4, "y": 3.25},
-        {"matrix": [4, 1], "x": 5, "y": 3.5},
-
-        {"matrix": [0, 6], "x": 7, "y": 3.5},
-        {"matrix": [4, 7], "x": 8, "y": 3.25},
-        {"matrix": [2, 8], "x": 9, "y": 3},
-        {"matrix": [3, 9], "x": 10, "y": 3.25},
-        {"matrix": [4, 10], "x": 11, "y": 3.75},
-        {"matrix": [1, 6], "x": 12, "y": 4},
-
-        {"matrix": [3, 5], "x": 4, "y": 4.75},
-        {"matrix": [2, 5], "x": 5, "y": 5},
-
-        {"matrix": [2, 6], "x": 7, "y": 5},
-        {"matrix": [3, 6], "x": 8, "y": 4.75}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ergo/keyboard.json b/keyboards/glenpickle/chimera_ergo/keyboard.json
new file mode 100644
index 00000000000..038498fd10a
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ergo/keyboard.json
@@ -0,0 +1,88 @@
+{
+  "keyboard_name": "Chimera Ergo",
+  "manufacturer": "Unknown",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [0, 5], "x": 1, "y": 0.75},
+        {"matrix": [2, 2], "x": 2, "y": 0.25},
+        {"matrix": [4, 2], "x": 3, "y": 0},
+        {"matrix": [3, 3], "x": 4, "y": 0.25},
+        {"matrix": [3, 4], "x": 5, "y": 0.5},
+
+        {"matrix": [3, 7], "x": 7, "y": 0.5},
+        {"matrix": [3, 8], "x": 8, "y": 0.25},
+        {"matrix": [4, 8], "x": 9, "y": 0},
+        {"matrix": [2, 9], "x": 10, "y": 0.25},
+        {"matrix": [4, 9], "x": 11, "y": 0.75},
+        {"matrix": [1, 11], "x": 12, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [3, 1], "x": 1, "y": 1.75},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [0, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [2, 4], "x": 5, "y": 1.5},
+
+        {"matrix": [2, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 7], "x": 8, "y": 1.25},
+        {"matrix": [0, 8], "x": 9, "y": 1},
+        {"matrix": [1, 9], "x": 10, "y": 1.25},
+        {"matrix": [3, 10], "x": 11, "y": 1.75},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [2, 1], "x": 1, "y": 2.75},
+        {"matrix": [0, 2], "x": 2, "y": 2.25},
+        {"matrix": [1, 3], "x": 3, "y": 2},
+        {"matrix": [0, 4], "x": 4, "y": 2.25},
+        {"matrix": [4, 0], "x": 5, "y": 2.5},
+
+        {"matrix": [4, 6], "x": 7, "y": 2.5},
+        {"matrix": [0, 7], "x": 8, "y": 2.25},
+        {"matrix": [1, 8], "x": 9, "y": 2},
+        {"matrix": [0, 9], "x": 10, "y": 2.25},
+        {"matrix": [2, 10], "x": 11, "y": 2.75},
+        {"matrix": [3, 11], "x": 12, "y": 3},
+
+        {"matrix": [1, 5], "x": 0, "y": 4},
+        {"matrix": [4, 4], "x": 1, "y": 3.75},
+        {"matrix": [3, 2], "x": 2, "y": 3.25},
+        {"matrix": [2, 3], "x": 3, "y": 3},
+        {"matrix": [4, 3], "x": 4, "y": 3.25},
+        {"matrix": [4, 1], "x": 5, "y": 3.5},
+
+        {"matrix": [0, 6], "x": 7, "y": 3.5},
+        {"matrix": [4, 7], "x": 8, "y": 3.25},
+        {"matrix": [2, 8], "x": 9, "y": 3},
+        {"matrix": [3, 9], "x": 10, "y": 3.25},
+        {"matrix": [4, 10], "x": 11, "y": 3.75},
+        {"matrix": [1, 6], "x": 12, "y": 4},
+
+        {"matrix": [3, 5], "x": 4, "y": 4.75},
+        {"matrix": [2, 5], "x": 5, "y": 5},
+
+        {"matrix": [2, 6], "x": 7, "y": 5},
+        {"matrix": [3, 6], "x": 8, "y": 4.75}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ergo/rules.mk b/keyboards/glenpickle/chimera_ergo/rules.mk
index f543b5fd9a2..18d234d62a0 100644
--- a/keyboards/glenpickle/chimera_ergo/rules.mk
+++ b/keyboards/glenpickle/chimera_ergo/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 = lite
 
 # project specific files
diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/info.json
deleted file mode 100644
index 300b6be928e..00000000000
--- a/keyboards/glenpickle/chimera_ls/info.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "keyboard_name": "Chimera Lets Split",
-  "manufacturer": "Unknown",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "community_layouts": ["ortho_4x12"],
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "layout": [
-        {"matrix": [0, 8], "x": 0, "y": 0},
-        {"matrix": [4, 8], "x": 1, "y": 0},
-        {"matrix": [2, 9], "x": 2, "y": 0},
-        {"matrix": [4, 7], "x": 3, "y": 0},
-        {"matrix": [4, 6], "x": 4, "y": 0},
-        {"matrix": [4, 5], "x": 5, "y": 0},
-        {"matrix": [4, 0], "x": 7, "y": 0},
-        {"matrix": [4, 1], "x": 8, "y": 0},
-        {"matrix": [4, 2], "x": 9, "y": 0},
-        {"matrix": [2, 4], "x": 10, "y": 0},
-        {"matrix": [4, 3], "x": 11, "y": 0},
-        {"matrix": [0, 3], "x": 12, "y": 0},
-
-        {"matrix": [0, 9], "x": 0, "y": 1},
-        {"matrix": [1, 9], "x": 1, "y": 1},
-        {"matrix": [3, 7], "x": 2, "y": 1},
-        {"matrix": [3, 6], "x": 3, "y": 1},
-        {"matrix": [3, 5], "x": 4, "y": 1},
-        {"matrix": [3, 9], "x": 5, "y": 1},
-        {"matrix": [3, 4], "x": 7, "y": 1},
-        {"matrix": [3, 0], "x": 8, "y": 1},
-        {"matrix": [3, 1], "x": 9, "y": 1},
-        {"matrix": [3, 2], "x": 10, "y": 1},
-        {"matrix": [1, 4], "x": 11, "y": 1},
-        {"matrix": [0, 4], "x": 12, "y": 1},
-
-        {"matrix": [1, 8], "x": 0, "y": 2},
-        {"matrix": [0, 7], "x": 1, "y": 2},
-        {"matrix": [2, 7], "x": 2, "y": 2},
-        {"matrix": [2, 6], "x": 3, "y": 2},
-        {"matrix": [1, 5], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 0], "x": 7, "y": 2},
-        {"matrix": [1, 0], "x": 8, "y": 2},
-        {"matrix": [2, 1], "x": 9, "y": 2},
-        {"matrix": [2, 2], "x": 10, "y": 2},
-        {"matrix": [0, 2], "x": 11, "y": 2},
-        {"matrix": [1, 3], "x": 12, "y": 2},
-
-        {"matrix": [2, 8], "x": 0, "y": 3},
-        {"matrix": [1, 7], "x": 1, "y": 3},
-        {"matrix": [0, 6], "x": 2, "y": 3},
-        {"matrix": [1, 6], "x": 3, "y": 3},
-        {"matrix": [0, 5], "x": 4, "y": 3},
-        {"matrix": [3, 8], "x": 5, "y": 3},
-        {"matrix": [3, 3], "x": 7, "y": 3},
-        {"matrix": [0, 0], "x": 8, "y": 3},
-        {"matrix": [1, 1], "x": 9, "y": 3},
-        {"matrix": [0, 1], "x": 10, "y": 3},
-        {"matrix": [1, 2], "x": 11, "y": 3},
-        {"matrix": [2, 3], "x": 12, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ls/keyboard.json b/keyboards/glenpickle/chimera_ls/keyboard.json
new file mode 100644
index 00000000000..b0d6a529124
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ls/keyboard.json
@@ -0,0 +1,79 @@
+{
+  "keyboard_name": "Chimera Lets Split",
+  "manufacturer": "Unknown",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "community_layouts": ["ortho_4x12"],
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 8], "x": 0, "y": 0},
+        {"matrix": [4, 8], "x": 1, "y": 0},
+        {"matrix": [2, 9], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [4, 6], "x": 4, "y": 0},
+        {"matrix": [4, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 7, "y": 0},
+        {"matrix": [4, 1], "x": 8, "y": 0},
+        {"matrix": [4, 2], "x": 9, "y": 0},
+        {"matrix": [2, 4], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [0, 3], "x": 12, "y": 0},
+
+        {"matrix": [0, 9], "x": 0, "y": 1},
+        {"matrix": [1, 9], "x": 1, "y": 1},
+        {"matrix": [3, 7], "x": 2, "y": 1},
+        {"matrix": [3, 6], "x": 3, "y": 1},
+        {"matrix": [3, 5], "x": 4, "y": 1},
+        {"matrix": [3, 9], "x": 5, "y": 1},
+        {"matrix": [3, 4], "x": 7, "y": 1},
+        {"matrix": [3, 0], "x": 8, "y": 1},
+        {"matrix": [3, 1], "x": 9, "y": 1},
+        {"matrix": [3, 2], "x": 10, "y": 1},
+        {"matrix": [1, 4], "x": 11, "y": 1},
+        {"matrix": [0, 4], "x": 12, "y": 1},
+
+        {"matrix": [1, 8], "x": 0, "y": 2},
+        {"matrix": [0, 7], "x": 1, "y": 2},
+        {"matrix": [2, 7], "x": 2, "y": 2},
+        {"matrix": [2, 6], "x": 3, "y": 2},
+        {"matrix": [1, 5], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 0], "x": 7, "y": 2},
+        {"matrix": [1, 0], "x": 8, "y": 2},
+        {"matrix": [2, 1], "x": 9, "y": 2},
+        {"matrix": [2, 2], "x": 10, "y": 2},
+        {"matrix": [0, 2], "x": 11, "y": 2},
+        {"matrix": [1, 3], "x": 12, "y": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3},
+        {"matrix": [1, 7], "x": 1, "y": 3},
+        {"matrix": [0, 6], "x": 2, "y": 3},
+        {"matrix": [1, 6], "x": 3, "y": 3},
+        {"matrix": [0, 5], "x": 4, "y": 3},
+        {"matrix": [3, 8], "x": 5, "y": 3},
+        {"matrix": [3, 3], "x": 7, "y": 3},
+        {"matrix": [0, 0], "x": 8, "y": 3},
+        {"matrix": [1, 1], "x": 9, "y": 3},
+        {"matrix": [0, 1], "x": 10, "y": 3},
+        {"matrix": [1, 2], "x": 11, "y": 3},
+        {"matrix": [2, 3], "x": 12, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ls/rules.mk b/keyboards/glenpickle/chimera_ls/rules.mk
index 706d6106538..812e3cef929 100644
--- a/keyboards/glenpickle/chimera_ls/rules.mk
+++ b/keyboards/glenpickle/chimera_ls/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 = lite
 
 # project specific files
diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/info.json
deleted file mode 100644
index 4932d2f5a5a..00000000000
--- a/keyboards/glenpickle/chimera_ortho/info.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "keyboard_name": "Chimera Ortho",
-  "manufacturer": "Unknown",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [4, 3], "x": 0, "y": 0},
-        {"matrix": [0, 0], "x": 1, "y": 0},
-        {"matrix": [0, 1], "x": 2, "y": 0},
-        {"matrix": [0, 2], "x": 3, "y": 0},
-        {"matrix": [0, 3], "x": 4, "y": 0},
-        {"matrix": [0, 4], "x": 5, "y": 0},
-        {"matrix": [3, 1], "x": 6, "y": 0},
-
-        {"matrix": [3, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 5], "x": 9.5, "y": 0},
-        {"matrix": [0, 6], "x": 10.5, "y": 0},
-        {"matrix": [0, 7], "x": 11.5, "y": 0},
-        {"matrix": [0, 8], "x": 12.5, "y": 0},
-        {"matrix": [0, 9], "x": 13.5, "y": 0},
-        {"matrix": [4, 6], "x": 14.5, "y": 0},
-
-        {"matrix": [4, 2], "x": 0, "y": 1},
-        {"matrix": [1, 0], "x": 1, "y": 1},
-        {"matrix": [1, 1], "x": 2, "y": 1},
-        {"matrix": [1, 2], "x": 3, "y": 1},
-        {"matrix": [1, 3], "x": 4, "y": 1},
-        {"matrix": [1, 4], "x": 5, "y": 1},
-        {"matrix": [3, 2], "x": 6, "y": 1},
-
-        {"matrix": [3, 7], "x": 8.5, "y": 1},
-        {"matrix": [1, 5], "x": 9.5, "y": 1},
-        {"matrix": [1, 6], "x": 10.5, "y": 1},
-        {"matrix": [1, 7], "x": 11.5, "y": 1},
-        {"matrix": [1, 8], "x": 12.5, "y": 1},
-        {"matrix": [1, 9], "x": 13.5, "y": 1},
-        {"matrix": [4, 7], "x": 14.5, "y": 1},
-
-        {"matrix": [4, 1], "x": 0, "y": 2},
-        {"matrix": [2, 0], "x": 1, "y": 2},
-        {"matrix": [2, 1], "x": 2, "y": 2},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [3, 3], "x": 6, "y": 2},
-
-        {"matrix": [3, 6], "x": 8.5, "y": 2},
-        {"matrix": [2, 5], "x": 9.5, "y": 2},
-        {"matrix": [2, 6], "x": 10.5, "y": 2},
-        {"matrix": [2, 7], "x": 11.5, "y": 2},
-        {"matrix": [2, 8], "x": 12.5, "y": 2},
-        {"matrix": [2, 9], "x": 13.5, "y": 2},
-        {"matrix": [4, 8], "x": 14.5, "y": 2},
-
-        {"matrix": [4, 4], "x": 4, "y": 3.25},
-        {"matrix": [3, 4], "x": 5, "y": 3.25},
-
-        {"matrix": [3, 5], "x": 9.5, "y": 3.25},
-        {"matrix": [4, 5], "x": 10.5, "y": 3.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ortho/keyboard.json b/keyboards/glenpickle/chimera_ortho/keyboard.json
new file mode 100644
index 00000000000..b62616ce689
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ortho/keyboard.json
@@ -0,0 +1,79 @@
+{
+  "keyboard_name": "Chimera Ortho",
+  "manufacturer": "Unknown",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [4, 3], "x": 0, "y": 0},
+        {"matrix": [0, 0], "x": 1, "y": 0},
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+        {"matrix": [3, 1], "x": 6, "y": 0},
+
+        {"matrix": [3, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 5], "x": 9.5, "y": 0},
+        {"matrix": [0, 6], "x": 10.5, "y": 0},
+        {"matrix": [0, 7], "x": 11.5, "y": 0},
+        {"matrix": [0, 8], "x": 12.5, "y": 0},
+        {"matrix": [0, 9], "x": 13.5, "y": 0},
+        {"matrix": [4, 6], "x": 14.5, "y": 0},
+
+        {"matrix": [4, 2], "x": 0, "y": 1},
+        {"matrix": [1, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [1, 2], "x": 3, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1},
+        {"matrix": [1, 4], "x": 5, "y": 1},
+        {"matrix": [3, 2], "x": 6, "y": 1},
+
+        {"matrix": [3, 7], "x": 8.5, "y": 1},
+        {"matrix": [1, 5], "x": 9.5, "y": 1},
+        {"matrix": [1, 6], "x": 10.5, "y": 1},
+        {"matrix": [1, 7], "x": 11.5, "y": 1},
+        {"matrix": [1, 8], "x": 12.5, "y": 1},
+        {"matrix": [1, 9], "x": 13.5, "y": 1},
+        {"matrix": [4, 7], "x": 14.5, "y": 1},
+
+        {"matrix": [4, 1], "x": 0, "y": 2},
+        {"matrix": [2, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [3, 3], "x": 6, "y": 2},
+
+        {"matrix": [3, 6], "x": 8.5, "y": 2},
+        {"matrix": [2, 5], "x": 9.5, "y": 2},
+        {"matrix": [2, 6], "x": 10.5, "y": 2},
+        {"matrix": [2, 7], "x": 11.5, "y": 2},
+        {"matrix": [2, 8], "x": 12.5, "y": 2},
+        {"matrix": [2, 9], "x": 13.5, "y": 2},
+        {"matrix": [4, 8], "x": 14.5, "y": 2},
+
+        {"matrix": [4, 4], "x": 4, "y": 3.25},
+        {"matrix": [3, 4], "x": 5, "y": 3.25},
+
+        {"matrix": [3, 5], "x": 9.5, "y": 3.25},
+        {"matrix": [4, 5], "x": 10.5, "y": 3.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ortho/rules.mk b/keyboards/glenpickle/chimera_ortho/rules.mk
index f543b5fd9a2..18d234d62a0 100644
--- a/keyboards/glenpickle/chimera_ortho/rules.mk
+++ b/keyboards/glenpickle/chimera_ortho/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 = lite
 
 # project specific files
diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/info.json
deleted file mode 100644
index 39d6c11eb22..00000000000
--- a/keyboards/glenpickle/chimera_ortho_plus/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "keyboard_name": "Chimera Ortho Plus",
-  "manufacturer": "Unknown",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0xDE1D",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [1, 0], "x": 0, "y": 0},
-        {"matrix": [0, 5], "x": 1, "y": 0},
-        {"matrix": [2, 2], "x": 2, "y": 0},
-        {"matrix": [0, 0], "x": 3, "y": 0},
-        {"matrix": [3, 3], "x": 4, "y": 0},
-        {"matrix": [3, 4], "x": 5, "y": 0},
-
-        {"matrix": [3, 7], "x": 7.5, "y": 0},
-        {"matrix": [3, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 10], "x": 9.5, "y": 0},
-        {"matrix": [2, 9], "x": 10.5, "y": 0},
-        {"matrix": [0, 11], "x": 11.5, "y": 0},
-        {"matrix": [1, 11], "x": 12.5, "y": 0},
-
-        {"matrix": [2, 0], "x": 0, "y": 1},
-        {"matrix": [3, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [0, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [2, 4], "x": 5, "y": 1},
-
-        {"matrix": [2, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 7], "x": 8.5, "y": 1},
-        {"matrix": [0, 8], "x": 9.5, "y": 1},
-        {"matrix": [1, 9], "x": 10.5, "y": 1},
-        {"matrix": [3, 10], "x": 11.5, "y": 1},
-        {"matrix": [2, 11], "x": 12.5, "y": 1},
-
-        {"matrix": [3, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [0, 2], "x": 2, "y": 2},
-        {"matrix": [1, 3], "x": 3, "y": 2},
-        {"matrix": [0, 4], "x": 4, "y": 2},
-        {"matrix": [4, 0], "x": 5, "y": 2},
-
-        {"matrix": [4, 6], "x": 7.5, "y": 2},
-        {"matrix": [0, 7], "x": 8.5, "y": 2},
-        {"matrix": [1, 8], "x": 9.5, "y": 2},
-        {"matrix": [0, 9], "x": 10.5, "y": 2},
-        {"matrix": [2, 10], "x": 11.5, "y": 2},
-        {"matrix": [3, 11], "x": 12.5, "y": 2},
-
-        {"matrix": [1, 5], "x": 0, "y": 3},
-        {"matrix": [1, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [2, 3], "x": 3, "y": 3},
-        {"matrix": [0, 1], "x": 4, "y": 3},
-        {"matrix": [4, 1], "x": 5, "y": 3},
-
-        {"matrix": [0, 6], "x": 7.5, "y": 3},
-        {"matrix": [4, 7], "x": 8.5, "y": 3},
-        {"matrix": [2, 8], "x": 9.5, "y": 3},
-        {"matrix": [3, 9], "x": 10.5, "y": 3},
-        {"matrix": [1, 10], "x": 11.5, "y": 3},
-        {"matrix": [1, 6], "x": 12.5, "y": 3},
-
-        {"matrix": [3, 5], "x": 4, "y": 4},
-        {"matrix": [2, 5], "x": 5, "y": 4},
-
-        {"matrix": [2, 6], "x": 7.5, "y": 4},
-        {"matrix": [3, 6], "x": 8.5, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ortho_plus/keyboard.json b/keyboards/glenpickle/chimera_ortho_plus/keyboard.json
new file mode 100644
index 00000000000..bf0ae445483
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ortho_plus/keyboard.json
@@ -0,0 +1,88 @@
+{
+  "keyboard_name": "Chimera Ortho Plus",
+  "manufacturer": "Unknown",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xDE1D",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true,
+    "unicode": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [1, 0], "x": 0, "y": 0},
+        {"matrix": [0, 5], "x": 1, "y": 0},
+        {"matrix": [2, 2], "x": 2, "y": 0},
+        {"matrix": [0, 0], "x": 3, "y": 0},
+        {"matrix": [3, 3], "x": 4, "y": 0},
+        {"matrix": [3, 4], "x": 5, "y": 0},
+
+        {"matrix": [3, 7], "x": 7.5, "y": 0},
+        {"matrix": [3, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+        {"matrix": [2, 9], "x": 10.5, "y": 0},
+        {"matrix": [0, 11], "x": 11.5, "y": 0},
+        {"matrix": [1, 11], "x": 12.5, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+        {"matrix": [3, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [0, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [2, 4], "x": 5, "y": 1},
+
+        {"matrix": [2, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 7], "x": 8.5, "y": 1},
+        {"matrix": [0, 8], "x": 9.5, "y": 1},
+        {"matrix": [1, 9], "x": 10.5, "y": 1},
+        {"matrix": [3, 10], "x": 11.5, "y": 1},
+        {"matrix": [2, 11], "x": 12.5, "y": 1},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [0, 2], "x": 2, "y": 2},
+        {"matrix": [1, 3], "x": 3, "y": 2},
+        {"matrix": [0, 4], "x": 4, "y": 2},
+        {"matrix": [4, 0], "x": 5, "y": 2},
+
+        {"matrix": [4, 6], "x": 7.5, "y": 2},
+        {"matrix": [0, 7], "x": 8.5, "y": 2},
+        {"matrix": [1, 8], "x": 9.5, "y": 2},
+        {"matrix": [0, 9], "x": 10.5, "y": 2},
+        {"matrix": [2, 10], "x": 11.5, "y": 2},
+        {"matrix": [3, 11], "x": 12.5, "y": 2},
+
+        {"matrix": [1, 5], "x": 0, "y": 3},
+        {"matrix": [1, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [2, 3], "x": 3, "y": 3},
+        {"matrix": [0, 1], "x": 4, "y": 3},
+        {"matrix": [4, 1], "x": 5, "y": 3},
+
+        {"matrix": [0, 6], "x": 7.5, "y": 3},
+        {"matrix": [4, 7], "x": 8.5, "y": 3},
+        {"matrix": [2, 8], "x": 9.5, "y": 3},
+        {"matrix": [3, 9], "x": 10.5, "y": 3},
+        {"matrix": [1, 10], "x": 11.5, "y": 3},
+        {"matrix": [1, 6], "x": 12.5, "y": 3},
+
+        {"matrix": [3, 5], "x": 4, "y": 4},
+        {"matrix": [2, 5], "x": 5, "y": 4},
+
+        {"matrix": [2, 6], "x": 7.5, "y": 4},
+        {"matrix": [3, 6], "x": 8.5, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ortho_plus/rules.mk b/keyboards/glenpickle/chimera_ortho_plus/rules.mk
index 539a2d1004b..18d234d62a0 100644
--- a/keyboards/glenpickle/chimera_ortho_plus/rules.mk
+++ b/keyboards/glenpickle/chimera_ortho_plus/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 = yes           # 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/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json
deleted file mode 100644
index 63ae544ad32..00000000000
--- a/keyboards/gmmk/numpad/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "keyboard_name": "GMMK Numpad",
-    "manufacturer": "Glorious",
-    "url": "https://www.gloriousgaming.com/products/gmmk-numpad",
-    "maintainer": "GloriousThrall",
-    "usb": {
-        "vid": "0x320F",
-        "pid": "0x5088",
-        "device_version": "0.0.1"
-    },
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 2048
-        }
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A2", "pin_b": "A1"}
-        ]
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "aw20216s"
-    },
-    "processor": "WB32F3G71",
-    "bootloader": "wb32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        "rows": ["A3", "A4", "A5", "A6", "A7"],
-        "cols": ["B7", "B1", "B10", "B11"]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "NUM", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
-                {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "+", "matrix": [1, 3], "x": 3, "y": 1, "h": 2},
-
-                {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
-                {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
-                {"label": "CALC", "matrix": [2, 3], "x": 4.25, "y": 0},
-
-                {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
-                {"label": "3", "matrix": [3, 2], "x": 2, "y": 3},
-                {"label": "RET", "matrix": [3, 3], "x": 3, "y": 3, "h": 2},
-
-                {"label": "0", "matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"label": ".", "matrix": [4, 3], "x": 2, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gmmk/numpad/keyboard.json b/keyboards/gmmk/numpad/keyboard.json
new file mode 100644
index 00000000000..70e2d3e6791
--- /dev/null
+++ b/keyboards/gmmk/numpad/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "GMMK Numpad",
+    "manufacturer": "Glorious",
+    "url": "https://www.gloriousgaming.com/products/gmmk-numpad",
+    "maintainer": "GloriousThrall",
+    "usb": {
+        "vid": "0x320F",
+        "pid": "0x5088",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 2048
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "A1"}
+        ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "aw20216s"
+    },
+    "processor": "WB32F3G71",
+    "bootloader": "wb32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "midi": true
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "rows": ["A3", "A4", "A5", "A6", "A7"],
+        "cols": ["B7", "B1", "B10", "B11"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "NUM", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "+", "matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "CALC", "matrix": [2, 3], "x": 4.25, "y": 0},
+
+                {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "3", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "RET", "matrix": [3, 3], "x": 3, "y": 3, "h": 2},
+
+                {"label": "0", "matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"label": ".", "matrix": [4, 3], "x": 2, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gmmk/numpad/rules.mk b/keyboards/gmmk/numpad/rules.mk
index d289eb81a4d..752b0ce9d0b 100644
--- a/keyboards/gmmk/numpad/rules.mk
+++ b/keyboards/gmmk/numpad/rules.mk
@@ -1,23 +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
-ENCODER_ENABLE = yes
-KEYBOARD_SHARED_EP = yes
-MIDI_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
-
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += matrix.c
diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json
deleted file mode 100644
index 38152a32e6c..00000000000
--- a/keyboards/gon/nerd60/info.json
+++ /dev/null
@@ -1,381 +0,0 @@
-{
-    "keyboard_name": "NerD 60",
-    "manufacturer": "GON",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4E45",
-        "pid": "0x3630",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5"],
-        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "bootmagic": {
-        "matrix": [8, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 7], "x": 13, "y": 0},
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [9, 7], "x": 1.25, "y": 3},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 7], "x": 13, "y": 0},
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [3, 6], "x": 12.75, "y": 2},
-                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [9, 7], "x": 1.25, "y": 3},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 7], "x": 13, "y": 0},
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [3, 6], "x": 12.75, "y": 2},
-                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [9, 7], "x": 1.25, "y": 3},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gon/nerd60/keyboard.json b/keyboards/gon/nerd60/keyboard.json
new file mode 100644
index 00000000000..33ad716b4fd
--- /dev/null
+++ b/keyboards/gon/nerd60/keyboard.json
@@ -0,0 +1,388 @@
+{
+    "keyboard_name": "NerD 60",
+    "manufacturer": "GON",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E45",
+        "pid": "0x3630",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5"],
+        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "bootmagic": {
+        "matrix": [8, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 7], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 7], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [3, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 7], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [3, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gon/nerd60/rules.mk b/keyboards/gon/nerd60/rules.mk
index e0782ddcb51..3437a35bdf1 100644
--- a/keyboards/gon/nerd60/rules.mk
+++ b/keyboards/gon/nerd60/rules.mk
@@ -1,15 +1,2 @@
 # 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 = 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/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json
deleted file mode 100644
index 103c856bf0b..00000000000
--- a/keyboards/gon/nerdtkl/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "keyboard_name": "NerD TKL",
-    "manufacturer": "GON",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4E45",
-        "pid": "0x5244",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5", "D1"],
-        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "bootmagic": {
-        "matrix": [8, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_tkl": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-
-                {"matrix": [9, 0], "x": 2, "y": 0},
-                {"matrix": [8, 1], "x": 3, "y": 0},
-                {"matrix": [9, 1], "x": 4, "y": 0},
-                {"matrix": [8, 2], "x": 5, "y": 0},
-
-                {"matrix": [9, 2], "x": 6.5, "y": 0},
-                {"matrix": [8, 3], "x": 7.5, "y": 0},
-                {"matrix": [9, 3], "x": 8.5, "y": 0},
-                {"matrix": [8, 4], "x": 9.5, "y": 0},
-
-                {"matrix": [9, 4], "x": 11, "y": 0},
-                {"matrix": [8, 5], "x": 12, "y": 0},
-                {"matrix": [9, 5], "x": 13, "y": 0},
-                {"matrix": [8, 6], "x": 14, "y": 0},
-
-                {"matrix": [9, 6], "x": 15.25, "y": 0},
-                {"matrix": [8, 8], "x": 16.25, "y": 0},
-                {"matrix": [9, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 0], "x": 1, "y": 1.25},
-                {"matrix": [0, 1], "x": 2, "y": 1.25},
-                {"matrix": [1, 1], "x": 3, "y": 1.25},
-                {"matrix": [0, 2], "x": 4, "y": 1.25},
-                {"matrix": [1, 2], "x": 5, "y": 1.25},
-                {"matrix": [0, 3], "x": 6, "y": 1.25},
-                {"matrix": [1, 3], "x": 7, "y": 1.25},
-                {"matrix": [0, 4], "x": 8, "y": 1.25},
-                {"matrix": [1, 4], "x": 9, "y": 1.25},
-                {"matrix": [0, 5], "x": 10, "y": 1.25},
-                {"matrix": [1, 5], "x": 11, "y": 1.25},
-                {"matrix": [0, 6], "x": 12, "y": 1.25},
-                {"matrix": [1, 6], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [0, 8], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 16.25, "y": 1.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [3, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [3, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [3, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [3, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [3, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
-                {"matrix": [3, 8], "x": 16.25, "y": 2.25},
-                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [5, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [4, 2], "x": 3.75, "y": 3.25},
-                {"matrix": [5, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [4, 3], "x": 5.75, "y": 3.25},
-                {"matrix": [5, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [4, 4], "x": 7.75, "y": 3.25},
-                {"matrix": [5, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [4, 5], "x": 9.75, "y": 3.25},
-                {"matrix": [5, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [4, 6], "x": 11.75, "y": 3.25},
-                {"matrix": [1, 7], "x": 12.75, "y": 3.25},
-                {"matrix": [5, 6], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 7], "x": 1.25, "y": 4.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [7, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [6, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [7, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [6, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [7, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [6, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [7, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [6, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [7, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [6, 6], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 4.25},
-
-                {"matrix": [6, 8], "x": 16.25, "y": 4.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [6, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [7, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [7, 8], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gon/nerdtkl/keyboard.json b/keyboards/gon/nerdtkl/keyboard.json
new file mode 100644
index 00000000000..301cbaf19f1
--- /dev/null
+++ b/keyboards/gon/nerdtkl/keyboard.json
@@ -0,0 +1,140 @@
+{
+    "keyboard_name": "NerD TKL",
+    "manufacturer": "GON",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E45",
+        "pid": "0x5244",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5", "D1"],
+        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "bootmagic": {
+        "matrix": [8, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_tkl": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+
+                {"matrix": [9, 0], "x": 2, "y": 0},
+                {"matrix": [8, 1], "x": 3, "y": 0},
+                {"matrix": [9, 1], "x": 4, "y": 0},
+                {"matrix": [8, 2], "x": 5, "y": 0},
+
+                {"matrix": [9, 2], "x": 6.5, "y": 0},
+                {"matrix": [8, 3], "x": 7.5, "y": 0},
+                {"matrix": [9, 3], "x": 8.5, "y": 0},
+                {"matrix": [8, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [9, 4], "x": 11, "y": 0},
+                {"matrix": [8, 5], "x": 12, "y": 0},
+                {"matrix": [9, 5], "x": 13, "y": 0},
+                {"matrix": [8, 6], "x": 14, "y": 0},
+
+                {"matrix": [9, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 8], "x": 16.25, "y": 0},
+                {"matrix": [9, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1, "y": 1.25},
+                {"matrix": [0, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 1], "x": 3, "y": 1.25},
+                {"matrix": [0, 2], "x": 4, "y": 1.25},
+                {"matrix": [1, 2], "x": 5, "y": 1.25},
+                {"matrix": [0, 3], "x": 6, "y": 1.25},
+                {"matrix": [1, 3], "x": 7, "y": 1.25},
+                {"matrix": [0, 4], "x": 8, "y": 1.25},
+                {"matrix": [1, 4], "x": 9, "y": 1.25},
+                {"matrix": [0, 5], "x": 10, "y": 1.25},
+                {"matrix": [1, 5], "x": 11, "y": 1.25},
+                {"matrix": [0, 6], "x": 12, "y": 1.25},
+                {"matrix": [1, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [0, 8], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [3, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [3, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [3, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [5, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [5, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [4, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [5, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [4, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [5, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [4, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [5, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [4, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [1, 7], "x": 12.75, "y": 3.25},
+                {"matrix": [5, 6], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 4.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [7, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [7, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [6, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [6, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [6, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [6, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [6, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [7, 8], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gon/nerdtkl/rules.mk b/keyboards/gon/nerdtkl/rules.mk
index e0782ddcb51..3437a35bdf1 100644
--- a/keyboards/gon/nerdtkl/rules.mk
+++ b/keyboards/gon/nerdtkl/rules.mk
@@ -1,15 +1,2 @@
 # 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 = 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/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json
deleted file mode 100644
index 13669a85420..00000000000
--- a/keyboards/gopolar/gg86/info.json
+++ /dev/null
@@ -1,381 +0,0 @@
-{
-    "keyboard_name": "GG86 Tai-Chi",
-    "manufacturer": "Gopolar",
-    "url": "",
-    "maintainer": "Gopolar",
-    "usb": {
-        "vid": "0x0007",
-        "pid": "0x0007",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 150
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"],
-        "rows": ["B0", "B1", "B2", "B3", "B7", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4.5},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gopolar/gg86/keyboard.json b/keyboards/gopolar/gg86/keyboard.json
new file mode 100644
index 00000000000..b704582aa6c
--- /dev/null
+++ b/keyboards/gopolar/gg86/keyboard.json
@@ -0,0 +1,393 @@
+{
+    "keyboard_name": "GG86 Tai-Chi",
+    "manufacturer": "Gopolar",
+    "url": "",
+    "maintainer": "Gopolar",
+    "usb": {
+        "vid": "0x0007",
+        "pid": "0x0007",
+        "device_version": "0.0.1",
+        "force_nkro": true,
+        "no_startup_check": true
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 150
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gopolar/gg86/rules.mk b/keyboards/gopolar/gg86/rules.mk
index acdf49b47da..7b380ccdfbe 100644
--- a/keyboards/gopolar/gg86/rules.mk
+++ b/keyboards/gopolar/gg86/rules.mk
@@ -1,24 +1 @@
 SRC += lib/logo.c
-
-# 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
-
-# Additional thing to reduce compiled size
-LTO_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
-
-# OLED enabled
-OLED_ENABLE = yes
diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json
deleted file mode 100644
index 653885f963e..00000000000
--- a/keyboards/gray_studio/cod67/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "keyboard_name": "COD67",
-  "manufacturer": "Graystudio",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4753",
-    "pid": "0x1000",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 20,
-    "sleep": true,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "B2"
-  },
-  "matrix_pins": {
-    "cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"],
-    "rows": ["C7", "C6", "B6", "B5", "B4"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "driver": "timer",
-    "pin": "D4",
-    "on_state": 0
-  },
-  "processor": "atmega32u4",
-  "bootloader": "lufa-ms",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [4, 8], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2},
-        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-        {"matrix": [3, 1], "x": 1.25, "y": 3},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 12], "x": 13, "y": 3},
-        {"matrix": [3, 13], "x": 14, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4},
-        {"matrix": [4, 2], "x": 2, "y": 4},
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 4], "x": 4, "y": 4},
-        {"matrix": [4, 5], "x": 5, "y": 4},
-        {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
-        {"matrix": [4, 7], "x": 8, "y": 4},
-        {"matrix": [0, 13], "x": 9, "y": 4},
-        {"matrix": [4, 9], "x": 10, "y": 4},
-        {"matrix": [4, 10], "x": 11, "y": 4},
-        {"matrix": [4, 11], "x": 12, "y": 4},
-        {"matrix": [4, 12], "x": 13, "y": 4},
-        {"matrix": [4, 13], "x": 14, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/gray_studio/cod67/keyboard.json b/keyboards/gray_studio/cod67/keyboard.json
new file mode 100644
index 00000000000..e3687ce9591
--- /dev/null
+++ b/keyboards/gray_studio/cod67/keyboard.json
@@ -0,0 +1,132 @@
+{
+  "keyboard_name": "COD67",
+  "manufacturer": "Graystudio",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4753",
+    "pid": "0x1000",
+    "device_version": "0.0.1"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "B2"
+  },
+  "matrix_pins": {
+    "cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "driver": "timer",
+    "pin": "D4",
+    "on_state": 0
+  },
+  "processor": "atmega32u4",
+  "bootloader": "lufa-ms",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "backlight": true,
+    "rgblight": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [4, 8], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 12], "x": 13, "y": 3},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
+        {"matrix": [4, 7], "x": 8, "y": 4},
+        {"matrix": [0, 13], "x": 9, "y": 4},
+        {"matrix": [4, 9], "x": 10, "y": 4},
+        {"matrix": [4, 10], "x": 11, "y": 4},
+        {"matrix": [4, 11], "x": 12, "y": 4},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 13], "x": 14, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/gray_studio/cod67/rules.mk b/keyboards/gray_studio/cod67/rules.mk
index c8d3337cb38..e22d5248895 100644
--- a/keyboards/gray_studio/cod67/rules.mk
+++ b/keyboards/gray_studio/cod67/rules.mk
@@ -1,15 +1,2 @@
 # This board uses the older unsafe 6k version of lufa-ms
 BOOTLOADER_SIZE = 6144
-
-# 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
-RGBLIGHT_ENABLE = yes       # Enable RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/gregandcin/teaqueen/info.json b/keyboards/gregandcin/teaqueen/keyboard.json
similarity index 100%
rename from keyboards/gregandcin/teaqueen/info.json
rename to keyboards/gregandcin/teaqueen/keyboard.json
diff --git a/keyboards/gummykey/info.json b/keyboards/gummykey/info.json
deleted file mode 100644
index 1520809502a..00000000000
--- a/keyboards/gummykey/info.json
+++ /dev/null
@@ -1,90 +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",
-    "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/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 6e0404820cd..00000000000
--- a/keyboards/gummykey/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 = 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/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json
deleted file mode 100644
index fb1dc102b7e..00000000000
--- a/keyboards/hadron/ver2/info.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "D6", "C7", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "B3", "B2", "B1", "B0"],
-        "rows": ["D7", "E6", "B4", "B5", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "hue_steps": 10,
-        "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": "D4"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "halfkay"
-}
diff --git a/keyboards/hadron/ver2/keyboard.json b/keyboards/hadron/ver2/keyboard.json
new file mode 100644
index 00000000000..fbb97f1c186
--- /dev/null
+++ b/keyboards/hadron/ver2/keyboard.json
@@ -0,0 +1,39 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "D6", "C7", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "B3", "B2", "B1", "B0"],
+        "rows": ["D7", "E6", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "hue_steps": 10,
+        "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": "D4"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true
+    }
+}
diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk
deleted file mode 100644
index 188b4696f18..00000000000
--- a/keyboards/hadron/ver2/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
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight
-OLED_ENABLE = yes
diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json
deleted file mode 100644
index 381a5dc5501..00000000000
--- a/keyboards/hadron/ver3/info.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["B8", "B2", "B10", "A0", "A1", "A2", "B0", "A3", "B1", "A6", "A7", "B12", "C13", "B11", "B9"],
-        "rows": ["C15", "C14", "A10", "A9", "A8"]
-    },
-    "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"
-}
diff --git a/keyboards/hadron/ver3/keyboard.json b/keyboards/hadron/ver3/keyboard.json
new file mode 100644
index 00000000000..02a75d59eb8
--- /dev/null
+++ b/keyboards/hadron/ver3/keyboard.json
@@ -0,0 +1,51 @@
+{
+    "usb": {
+        "device_version": "0.0.3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["B8", "B2", "B10", "A0", "A1", "A2", "B0", "A3", "B1", "A6", "A7", "B12", "C13", "B11", "B9"],
+        "rows": ["C15", "C14", "A10", "A9", "A8"]
+    },
+    "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",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "audio": true,
+        "rgblight": true,
+        "haptic": true,
+        "oled": true,
+        "encoder": true
+    },
+    "board": "QMK_PROTON_C"
+}
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
index edc5fa7d5bf..dea510c2ab3 100644
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@@ -1,17 +1 @@
-# 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 = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = drv2605l
-OLED_ENABLE = yes
-ENCODER_ENABLER = yes
diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json
deleted file mode 100644
index 225c5dcb37a..00000000000
--- a/keyboards/halfcliff/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "halfcliff",
-    "manufacturer": "n2",
-    "url": "https://github.com/N2-Sumikko",
-    "maintainer": "n2",
-    "usb": {
-        "vid": "0x0335",
-        "pid": "0x0021",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D4", "pin_b": "F4", "resolution": 2}
-        ]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 10,
-        "sleep": true,
-        "split_count": [5, 5]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [5, 1], "x": 0.75, "y": 0},
-                {"matrix": [5, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 0], "x": 2.75, "y": 0},
-                {"matrix": [0, 1], "x": 3.75, "y": 0},
-                {"matrix": [0, 2], "x": 4.75, "y": 0},
-                {"matrix": [0, 3], "x": 5.75, "y": 0},
-                {"matrix": [0, 4], "x": 6.75, "y": 0},
-
-                {"matrix": [10, 4], "x": 8.25, "y": 0},
-                {"matrix": [10, 3], "x": 9.25, "y": 0},
-                {"matrix": [10, 2], "x": 10.25, "y": 0},
-                {"matrix": [10, 1], "x": 11.25, "y": 0},
-                {"matrix": [10, 0], "x": 12.25, "y": 0},
-                {"matrix": [15, 0], "x": 13.25, "y": 0},
-                {"matrix": [15, 1], "x": 14.25, "y": 0},
-                {"matrix": [15, 2], "x": 15.25, "y": 0},
-
-                {"matrix": [6, 1], "x": 0.25, "y": 1, "w": 1.5},
-                {"matrix": [6, 0], "x": 1.75, "y": 1},
-                {"matrix": [1, 0], "x": 2.75, "y": 1},
-                {"matrix": [1, 1], "x": 3.75, "y": 1},
-                {"matrix": [1, 2], "x": 4.75, "y": 1},
-                {"matrix": [1, 3], "x": 5.75, "y": 1},
-                {"matrix": [1, 4], "x": 6.75, "y": 1},
-
-                {"matrix": [11, 4], "x": 8.25, "y": 1},
-                {"matrix": [11, 3], "x": 9.25, "y": 1},
-                {"matrix": [11, 2], "x": 10.25, "y": 1},
-                {"matrix": [11, 1], "x": 11.25, "y": 1},
-                {"matrix": [11, 0], "x": 12.25, "y": 1},
-                {"matrix": [16, 0], "x": 13.25, "y": 1},
-                {"matrix": [16, 1], "x": 14.25, "y": 1},
-                {"matrix": [16, 2], "x": 16.25, "y": 0},
-
-                {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 2},
-                {"matrix": [2, 0], "x": 2.75, "y": 2},
-                {"matrix": [2, 1], "x": 3.75, "y": 2},
-                {"matrix": [2, 2], "x": 4.75, "y": 2},
-                {"matrix": [2, 3], "x": 5.75, "y": 2},
-                {"matrix": [2, 4], "x": 6.75, "y": 2},
-
-                {"matrix": [12, 4], "x": 8.25, "y": 2},
-                {"matrix": [12, 3], "x": 9.25, "y": 2},
-                {"matrix": [12, 2], "x": 10.25, "y": 2},
-                {"matrix": [12, 1], "x": 11.25, "y": 2},
-                {"matrix": [12, 0], "x": 12.25, "y": 2},
-                {"matrix": [17, 0], "x": 13.25, "y": 2},
-                {"matrix": [17, 1], "x": 14.25, "y": 2},
-                {"matrix": [17, 2], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 1], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [8, 0], "x": 1.75, "y": 3},
-                {"matrix": [3, 0], "x": 2.75, "y": 3},
-                {"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": [13, 4], "x": 8.25, "y": 3},
-                {"matrix": [13, 3], "x": 9.25, "y": 3},
-                {"matrix": [13, 2], "x": 10.25, "y": 3},
-                {"matrix": [13, 1], "x": 11.25, "y": 3},
-                {"matrix": [13, 0], "x": 12.25, "y": 3},
-                {"matrix": [18, 0], "x": 13.25, "y": 3},
-                {"matrix": [18, 1], "x": 14.25, "y": 3},
-                {"matrix": [18, 2], "x": 15.25, "y": 3, "w": 2},
-
-                {"matrix": [9, 1], "x": 0.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.75, "y": 4},
-                {"matrix": [4, 0], "x": 2.75, "y": 4},
-                {"matrix": [4, 1], "x": 3.75, "y": 4},
-                {"matrix": [4, 2], "x": 4.75, "y": 4},
-                {"matrix": [4, 3], "x": 5.75, "y": 4},
-                {"matrix": [4, 4], "x": 6.75, "y": 4},
-
-                {"matrix": [14, 4], "x": 8.25, "y": 4},
-                {"matrix": [14, 3], "x": 9.25, "y": 4},
-                {"matrix": [14, 2], "x": 10.25, "y": 4},
-                {"matrix": [14, 1], "x": 11.25, "y": 4},
-                {"matrix": [14, 0], "x": 12.25, "y": 4},
-                {"matrix": [19, 0], "x": 13.25, "y": 4},
-                {"matrix": [19, 1], "x": 14.25, "y": 4},
-                {"matrix": [19, 2], "x": 15.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/halfcliff/keyboard.json b/keyboards/halfcliff/keyboard.json
new file mode 100644
index 00000000000..1f60537b249
--- /dev/null
+++ b/keyboards/halfcliff/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "halfcliff",
+    "manufacturer": "n2",
+    "url": "https://github.com/N2-Sumikko",
+    "maintainer": "n2",
+    "usb": {
+        "vid": "0x0335",
+        "pid": "0x0021",
+        "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D4", "pin_b": "F4", "resolution": 2}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "sleep": true,
+        "split_count": [5, 5]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 1], "x": 0.75, "y": 0},
+                {"matrix": [5, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 0], "x": 2.75, "y": 0},
+                {"matrix": [0, 1], "x": 3.75, "y": 0},
+                {"matrix": [0, 2], "x": 4.75, "y": 0},
+                {"matrix": [0, 3], "x": 5.75, "y": 0},
+                {"matrix": [0, 4], "x": 6.75, "y": 0},
+
+                {"matrix": [10, 4], "x": 8.25, "y": 0},
+                {"matrix": [10, 3], "x": 9.25, "y": 0},
+                {"matrix": [10, 2], "x": 10.25, "y": 0},
+                {"matrix": [10, 1], "x": 11.25, "y": 0},
+                {"matrix": [10, 0], "x": 12.25, "y": 0},
+                {"matrix": [15, 0], "x": 13.25, "y": 0},
+                {"matrix": [15, 1], "x": 14.25, "y": 0},
+                {"matrix": [15, 2], "x": 15.25, "y": 0},
+
+                {"matrix": [6, 1], "x": 0.25, "y": 1, "w": 1.5},
+                {"matrix": [6, 0], "x": 1.75, "y": 1},
+                {"matrix": [1, 0], "x": 2.75, "y": 1},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+
+                {"matrix": [11, 4], "x": 8.25, "y": 1},
+                {"matrix": [11, 3], "x": 9.25, "y": 1},
+                {"matrix": [11, 2], "x": 10.25, "y": 1},
+                {"matrix": [11, 1], "x": 11.25, "y": 1},
+                {"matrix": [11, 0], "x": 12.25, "y": 1},
+                {"matrix": [16, 0], "x": 13.25, "y": 1},
+                {"matrix": [16, 1], "x": 14.25, "y": 1},
+                {"matrix": [16, 2], "x": 16.25, "y": 0},
+
+                {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 2},
+                {"matrix": [2, 0], "x": 2.75, "y": 2},
+                {"matrix": [2, 1], "x": 3.75, "y": 2},
+                {"matrix": [2, 2], "x": 4.75, "y": 2},
+                {"matrix": [2, 3], "x": 5.75, "y": 2},
+                {"matrix": [2, 4], "x": 6.75, "y": 2},
+
+                {"matrix": [12, 4], "x": 8.25, "y": 2},
+                {"matrix": [12, 3], "x": 9.25, "y": 2},
+                {"matrix": [12, 2], "x": 10.25, "y": 2},
+                {"matrix": [12, 1], "x": 11.25, "y": 2},
+                {"matrix": [12, 0], "x": 12.25, "y": 2},
+                {"matrix": [17, 0], "x": 13.25, "y": 2},
+                {"matrix": [17, 1], "x": 14.25, "y": 2},
+                {"matrix": [17, 2], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [8, 0], "x": 1.75, "y": 3},
+                {"matrix": [3, 0], "x": 2.75, "y": 3},
+                {"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": [13, 4], "x": 8.25, "y": 3},
+                {"matrix": [13, 3], "x": 9.25, "y": 3},
+                {"matrix": [13, 2], "x": 10.25, "y": 3},
+                {"matrix": [13, 1], "x": 11.25, "y": 3},
+                {"matrix": [13, 0], "x": 12.25, "y": 3},
+                {"matrix": [18, 0], "x": 13.25, "y": 3},
+                {"matrix": [18, 1], "x": 14.25, "y": 3},
+                {"matrix": [18, 2], "x": 15.25, "y": 3, "w": 2},
+
+                {"matrix": [9, 1], "x": 0.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.75, "y": 4},
+                {"matrix": [4, 0], "x": 2.75, "y": 4},
+                {"matrix": [4, 1], "x": 3.75, "y": 4},
+                {"matrix": [4, 2], "x": 4.75, "y": 4},
+                {"matrix": [4, 3], "x": 5.75, "y": 4},
+                {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+                {"matrix": [14, 4], "x": 8.25, "y": 4},
+                {"matrix": [14, 3], "x": 9.25, "y": 4},
+                {"matrix": [14, 2], "x": 10.25, "y": 4},
+                {"matrix": [14, 1], "x": 11.25, "y": 4},
+                {"matrix": [14, 0], "x": 12.25, "y": 4},
+                {"matrix": [19, 0], "x": 13.25, "y": 4},
+                {"matrix": [19, 1], "x": 14.25, "y": 4},
+                {"matrix": [19, 2], "x": 15.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/halfcliff/rules.mk b/keyboards/halfcliff/rules.mk
index 425015c04d8..8784813b335 100644
--- a/keyboards/halfcliff/rules.mk
+++ b/keyboards/halfcliff/rules.mk
@@ -1,18 +1,2 @@
-# 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
-ENCODER_ENABLE = no
-POINTING_DEVICE_ENABLE = no
 CUSTOM_MATRIX = yes
-OLED_ENABLE = no
-
 SRC += matrix.c
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 d3ca7b060e1..00000000000
--- a/keyboards/hand88/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
diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json
deleted file mode 100644
index 605c77875d2..00000000000
--- a/keyboards/handwired/108key_trackpoint/info.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-  "keyboard_name": "108Key-TrackPoint",
-  "manufacturer": "QMK",
-  "url": "",
-  "maintainer": "mkem114",
-  "usb": {
-    "vid": "0x1234",
-    "pid": "0x5678",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "F0", "D3", "D4", "F1", "D6", "D7", "E0", "E1", "E2", "E3", "E4", "E5", "E6"],
-    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "at90usb1286",
-  "bootloader": "halfkay",
-  "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": [0, 17], "x": 17.25, "y": 0},
-
-        {"matrix": [0, 19], "x": 18.5, "y": 0},
-        {"matrix": [0, 20], "x": 19.5, "y": 0},
-        {"matrix": [0, 21], "x": 20.5, "y": 0},
-        {"matrix": [0, 22], "x": 21.5, "y": 0},
-
-        {"matrix": [2, 0], "x": 0, "y": 1.5},
-        {"matrix": [2, 1], "x": 1, "y": 1.5},
-        {"matrix": [2, 2], "x": 2, "y": 1.5},
-        {"matrix": [2, 3], "x": 3, "y": 1.5},
-        {"matrix": [2, 4], "x": 4, "y": 1.5},
-        {"matrix": [2, 5], "x": 5, "y": 1.5},
-        {"matrix": [2, 6], "x": 6, "y": 1.5},
-        {"matrix": [2, 7], "x": 7, "y": 1.5},
-        {"matrix": [2, 8], "x": 8, "y": 1.5},
-        {"matrix": [2, 9], "x": 9, "y": 1.5},
-        {"matrix": [2, 10], "x": 10, "y": 1.5},
-        {"matrix": [2, 11], "x": 11, "y": 1.5},
-        {"matrix": [2, 12], "x": 12, "y": 1.5},
-        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [2, 15], "x": 15.25, "y": 1.5},
-        {"matrix": [2, 16], "x": 16.25, "y": 1.5},
-        {"matrix": [2, 17], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 19], "x": 18.5, "y": 1.5},
-        {"matrix": [2, 20], "x": 19.5, "y": 1.5},
-        {"matrix": [2, 21], "x": 20.5, "y": 1.5},
-        {"matrix": [2, 22], "x": 21.5, "y": 1.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [3, 2], "x": 1.5, "y": 2.5},
-        {"matrix": [3, 3], "x": 2.5, "y": 2.5},
-        {"matrix": [3, 4], "x": 3.5, "y": 2.5},
-        {"matrix": [3, 5], "x": 4.5, "y": 2.5},
-        {"matrix": [3, 6], "x": 5.5, "y": 2.5},
-        {"matrix": [3, 7], "x": 6.5, "y": 2.5},
-        {"matrix": [3, 8], "x": 7.5, "y": 2.5},
-        {"matrix": [3, 9], "x": 8.5, "y": 2.5},
-        {"matrix": [3, 10], "x": 9.5, "y": 2.5},
-        {"matrix": [3, 11], "x": 10.5, "y": 2.5},
-        {"matrix": [3, 12], "x": 11.5, "y": 2.5},
-        {"matrix": [3, 13], "x": 12.5, "y": 2.5},
-        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [3, 15], "x": 15.25, "y": 2.5},
-        {"matrix": [3, 16], "x": 16.25, "y": 2.5},
-        {"matrix": [3, 17], "x": 17.25, "y": 2.5},
-
-        {"matrix": [3, 19], "x": 18.5, "y": 2.5},
-        {"matrix": [3, 20], "x": 19.5, "y": 2.5},
-        {"matrix": [3, 21], "x": 20.5, "y": 2.5},
-
-        {"matrix": [4, 0], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [4, 2], "x": 1.75, "y": 3.5},
-        {"matrix": [4, 3], "x": 2.75, "y": 3.5},
-        {"matrix": [4, 4], "x": 3.75, "y": 3.5},
-        {"matrix": [4, 5], "x": 4.75, "y": 3.5},
-        {"matrix": [4, 6], "x": 5.75, "y": 3.5},
-        {"matrix": [4, 7], "x": 6.75, "y": 3.5},
-        {"matrix": [4, 8], "x": 7.75, "y": 3.5},
-        {"matrix": [4, 9], "x": 8.75, "y": 3.5},
-        {"matrix": [4, 10], "x": 9.75, "y": 3.5},
-        {"matrix": [4, 11], "x": 10.75, "y": 3.5},
-        {"matrix": [4, 12], "x": 11.75, "y": 3.5},
-        {"matrix": [4, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [4, 19], "x": 18.5, "y": 3.5},
-        {"matrix": [4, 20], "x": 19.5, "y": 3.5},
-        {"matrix": [4, 21], "x": 20.5, "y": 3.5},
-        {"matrix": [4, 22], "x": 21.5, "y": 2.5, "h": 2},
-
-        {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [5, 2], "x": 2.25, "y": 4.5},
-        {"matrix": [5, 3], "x": 3.25, "y": 4.5},
-        {"matrix": [5, 4], "x": 4.25, "y": 4.5},
-        {"matrix": [5, 5], "x": 5.25, "y": 4.5},
-        {"matrix": [5, 6], "x": 6.25, "y": 4.5},
-        {"matrix": [5, 7], "x": 7.25, "y": 4.5},
-        {"matrix": [5, 8], "x": 8.25, "y": 4.5},
-        {"matrix": [5, 9], "x": 9.25, "y": 4.5},
-        {"matrix": [5, 10], "x": 10.25, "y": 4.5},
-        {"matrix": [5, 11], "x": 11.25, "y": 4.5},
-        {"matrix": [5, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [5, 16], "x": 16.25, "y": 4.5},
-
-        {"matrix": [5, 19], "x": 18.5, "y": 4.5},
-        {"matrix": [5, 20], "x": 19.5, "y": 4.5},
-        {"matrix": [5, 21], "x": 20.5, "y": 4.5},
-
-        {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [6, 10], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 13], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 14], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [6, 15], "x": 15.25, "y": 5.5},
-        {"matrix": [6, 16], "x": 16.25, "y": 5.5},
-        {"matrix": [6, 17], "x": 17.25, "y": 5.5},
-
-        {"matrix": [6, 19], "x": 18.5, "y": 5.5, "w": 2},
-        {"matrix": [6, 21], "x": 20.5, "y": 5.5},
-        {"matrix": [6, 22], "x": 21.5, "y": 4.5, "h": 2},
-
-        {"matrix": [7, 5], "x": 5.25, "y": 6.5},
-        {"matrix": [7, 6], "x": 6.25, "y": 6.5},
-        {"matrix": [7, 7], "x": 7.25, "y": 6.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/108key_trackpoint/keyboard.json b/keyboards/handwired/108key_trackpoint/keyboard.json
new file mode 100644
index 00000000000..396b4c33cb5
--- /dev/null
+++ b/keyboards/handwired/108key_trackpoint/keyboard.json
@@ -0,0 +1,165 @@
+{
+  "keyboard_name": "108Key-TrackPoint",
+  "manufacturer": "QMK",
+  "url": "",
+  "maintainer": "mkem114",
+  "usb": {
+    "vid": "0x1234",
+    "pid": "0x5678",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "F0", "D3", "D4", "F1", "D6", "D7", "E0", "E1", "E2", "E3", "E4", "E5", "E6"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "at90usb1286",
+  "bootloader": "halfkay",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true,
+    "ps2_mouse": true,
+    "ps2": true
+  },
+  "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": [0, 17], "x": 17.25, "y": 0},
+
+        {"matrix": [0, 19], "x": 18.5, "y": 0},
+        {"matrix": [0, 20], "x": 19.5, "y": 0},
+        {"matrix": [0, 21], "x": 20.5, "y": 0},
+        {"matrix": [0, 22], "x": 21.5, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1.5},
+        {"matrix": [2, 1], "x": 1, "y": 1.5},
+        {"matrix": [2, 2], "x": 2, "y": 1.5},
+        {"matrix": [2, 3], "x": 3, "y": 1.5},
+        {"matrix": [2, 4], "x": 4, "y": 1.5},
+        {"matrix": [2, 5], "x": 5, "y": 1.5},
+        {"matrix": [2, 6], "x": 6, "y": 1.5},
+        {"matrix": [2, 7], "x": 7, "y": 1.5},
+        {"matrix": [2, 8], "x": 8, "y": 1.5},
+        {"matrix": [2, 9], "x": 9, "y": 1.5},
+        {"matrix": [2, 10], "x": 10, "y": 1.5},
+        {"matrix": [2, 11], "x": 11, "y": 1.5},
+        {"matrix": [2, 12], "x": 12, "y": 1.5},
+        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [2, 15], "x": 15.25, "y": 1.5},
+        {"matrix": [2, 16], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 17], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 19], "x": 18.5, "y": 1.5},
+        {"matrix": [2, 20], "x": 19.5, "y": 1.5},
+        {"matrix": [2, 21], "x": 20.5, "y": 1.5},
+        {"matrix": [2, 22], "x": 21.5, "y": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+        {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+        {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+        {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+        {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+        {"matrix": [3, 8], "x": 7.5, "y": 2.5},
+        {"matrix": [3, 9], "x": 8.5, "y": 2.5},
+        {"matrix": [3, 10], "x": 9.5, "y": 2.5},
+        {"matrix": [3, 11], "x": 10.5, "y": 2.5},
+        {"matrix": [3, 12], "x": 11.5, "y": 2.5},
+        {"matrix": [3, 13], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [3, 15], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 16], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 17], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 19], "x": 18.5, "y": 2.5},
+        {"matrix": [3, 20], "x": 19.5, "y": 2.5},
+        {"matrix": [3, 21], "x": 20.5, "y": 2.5},
+
+        {"matrix": [4, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [4, 2], "x": 1.75, "y": 3.5},
+        {"matrix": [4, 3], "x": 2.75, "y": 3.5},
+        {"matrix": [4, 4], "x": 3.75, "y": 3.5},
+        {"matrix": [4, 5], "x": 4.75, "y": 3.5},
+        {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [4, 7], "x": 6.75, "y": 3.5},
+        {"matrix": [4, 8], "x": 7.75, "y": 3.5},
+        {"matrix": [4, 9], "x": 8.75, "y": 3.5},
+        {"matrix": [4, 10], "x": 9.75, "y": 3.5},
+        {"matrix": [4, 11], "x": 10.75, "y": 3.5},
+        {"matrix": [4, 12], "x": 11.75, "y": 3.5},
+        {"matrix": [4, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 19], "x": 18.5, "y": 3.5},
+        {"matrix": [4, 20], "x": 19.5, "y": 3.5},
+        {"matrix": [4, 21], "x": 20.5, "y": 3.5},
+        {"matrix": [4, 22], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [5, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [5, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [5, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [5, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [5, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [5, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [5, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [5, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [5, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [5, 16], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 19], "x": 18.5, "y": 4.5},
+        {"matrix": [5, 20], "x": 19.5, "y": 4.5},
+        {"matrix": [5, 21], "x": 20.5, "y": 4.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [6, 10], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [6, 15], "x": 15.25, "y": 5.5},
+        {"matrix": [6, 16], "x": 16.25, "y": 5.5},
+        {"matrix": [6, 17], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 19], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 21], "x": 20.5, "y": 5.5},
+        {"matrix": [6, 22], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [7, 5], "x": 5.25, "y": 6.5},
+        {"matrix": [7, 6], "x": 6.25, "y": 6.5},
+        {"matrix": [7, 7], "x": 7.25, "y": 6.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/108key_trackpoint/rules.mk b/keyboards/handwired/108key_trackpoint/rules.mk
index acdf7bf3932..74035c9903b 100644
--- a/keyboards/handwired/108key_trackpoint/rules.mk
+++ b/keyboards/handwired/108key_trackpoint/rules.mk
@@ -1,15 +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 = 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
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
 PS2_DRIVER = usart
diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json
deleted file mode 100644
index 9b0164ed85e..00000000000
--- a/keyboards/handwired/10k/info.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "keyboard_name": "10k",
-  "maintainer": "Nabos",
-  "manufacturer": "Nabos",
-  "diode_direction": "COL2ROW",
-  "matrix_pins": {
-    "cols": ["C6", "D7", "E6", "B4", "B5"],
-    "rows": ["B6"]
-  },
-  "features": {
-    "bootmagic": false,
-    "command": false,
-    "console": false,
-    "extrakey": false,
-    "mousekey": false,
-    "nkro": false
-  },
-  "split": {
-    "enabled": true
-  },
-  "usb": {
-    "vid": "0x6869",
-    "pid": "0x0001",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_split_1x5"
-  },
-  "layouts": {
-    "LAYOUT_split_1x5": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.25},
-        {"matrix": [0, 1], "x": 1, "y": 0.125},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0.5},
-        {"matrix": [0, 4], "x": 3.75, "y": 2.75},
-
-        {"matrix": [1, 0], "x": 5.75, "y": 2.75},
-        {"matrix": [1, 1], "x": 6.5, "y": 0.5},
-        {"matrix": [1, 2], "x": 7.5, "y": 0},
-        {"matrix": [1, 3], "x": 8.5, "y": 0.125},
-        {"matrix": [1, 4], "x": 9.5, "y": 0.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/10k/keyboard.json b/keyboards/handwired/10k/keyboard.json
new file mode 100644
index 00000000000..a3293601e3a
--- /dev/null
+++ b/keyboards/handwired/10k/keyboard.json
@@ -0,0 +1,51 @@
+{
+  "keyboard_name": "10k",
+  "maintainer": "Nabos",
+  "manufacturer": "Nabos",
+  "diode_direction": "COL2ROW",
+  "matrix_pins": {
+    "cols": ["C6", "D7", "E6", "B4", "B5"],
+    "rows": ["B6"]
+  },
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "bootmagic": false,
+    "command": false,
+    "console": false,
+    "extrakey": false,
+    "mousekey": false,
+    "nkro": false
+  },
+  "split": {
+    "enabled": true
+  },
+  "usb": {
+    "vid": "0x6869",
+    "pid": "0x0001",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_split_1x5"
+  },
+  "layouts": {
+    "LAYOUT_split_1x5": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.25},
+        {"matrix": [0, 1], "x": 1, "y": 0.125},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.5},
+        {"matrix": [0, 4], "x": 3.75, "y": 2.75},
+
+        {"matrix": [1, 0], "x": 5.75, "y": 2.75},
+        {"matrix": [1, 1], "x": 6.5, "y": 0.5},
+        {"matrix": [1, 2], "x": 7.5, "y": 0},
+        {"matrix": [1, 3], "x": 8.5, "y": 0.125},
+        {"matrix": [1, 4], "x": 9.5, "y": 0.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/handwired/10k/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json
deleted file mode 100644
index e2cc8dbf716..00000000000
--- a/keyboards/handwired/42/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "keyboard_name": "42",
-    "manufacturer": "nglgzz",
-    "url": "",
-    "maintainer": "nglgzz",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.3"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "tapping": {
-        "term": 100
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "F0", "F1", "F4", "B6", "B5", "D7", "C7", "D6", "B7"],
-        "rows": ["D2", "D3", "D0", "D1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.625},
-                {"matrix": [0, 1], "x": 1, "y": 0.417},
-                {"matrix": [0, 2], "x": 2, "y": 0.208},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.208},
-                {"matrix": [0, 5], "x": 5, "y": 0.417},
-
-                {"matrix": [0, 6], "x": 8.5, "y": 0.417},
-                {"matrix": [0, 7], "x": 9.5, "y": 0.208},
-                {"matrix": [0, 8], "x": 10.5, "y": 0},
-                {"matrix": [0, 9], "x": 11.5, "y": 0.208},
-                {"matrix": [0, 10], "x": 12.5, "y": 0.417},
-                {"matrix": [0, 11], "x": 13.5, "y": 0.625},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.625},
-                {"matrix": [1, 1], "x": 1, "y": 1.417},
-                {"matrix": [1, 2], "x": 2, "y": 1.208},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.208},
-                {"matrix": [1, 5], "x": 5, "y": 1.417},
-
-                {"matrix": [1, 6], "x": 8.5, "y": 1.417},
-                {"matrix": [1, 7], "x": 9.5, "y": 1.208},
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1.208},
-                {"matrix": [1, 10], "x": 12.5, "y": 1.417},
-                {"matrix": [1, 11], "x": 13.5, "y": 1.625},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.625},
-                {"matrix": [2, 1], "x": 1, "y": 2.417},
-                {"matrix": [2, 2], "x": 2, "y": 2.208},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.208},
-                {"matrix": [2, 5], "x": 5, "y": 2.417},
-
-                {"matrix": [2, 6], "x": 8.5, "y": 2.417},
-                {"matrix": [2, 7], "x": 9.5, "y": 2.208},
-                {"matrix": [2, 8], "x": 10.5, "y": 2},
-                {"matrix": [2, 9], "x": 11.5, "y": 2.208},
-                {"matrix": [2, 10], "x": 12.5, "y": 2.417},
-                {"matrix": [2, 11], "x": 13.5, "y": 2.625},
-
-                {"matrix": [3, 3], "x": 4, "y": 3.208},
-                {"matrix": [3, 4], "x": 5, "y": 3.417},
-                {"matrix": [3, 5], "x": 5.75, "y": 4.417},
-
-                {"matrix": [3, 6], "x": 7.75, "y": 4.417},
-                {"matrix": [3, 7], "x": 8.5, "y": 3.417},
-                {"matrix": [3, 8], "x": 9.5, "y": 3.208}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/42/keyboard.json b/keyboards/handwired/42/keyboard.json
new file mode 100644
index 00000000000..d68dcd1ec2f
--- /dev/null
+++ b/keyboards/handwired/42/keyboard.json
@@ -0,0 +1,86 @@
+{
+    "keyboard_name": "42",
+    "manufacturer": "nglgzz",
+    "url": "",
+    "maintainer": "nglgzz",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.3"
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "tapping": {
+        "term": 100
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "F0", "F1", "F4", "B6", "B5", "D7", "C7", "D6", "B7"],
+        "rows": ["D2", "D3", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "bluetooth": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.625},
+                {"matrix": [0, 1], "x": 1, "y": 0.417},
+                {"matrix": [0, 2], "x": 2, "y": 0.208},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.208},
+                {"matrix": [0, 5], "x": 5, "y": 0.417},
+
+                {"matrix": [0, 6], "x": 8.5, "y": 0.417},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.208},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.208},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.417},
+                {"matrix": [0, 11], "x": 13.5, "y": 0.625},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.625},
+                {"matrix": [1, 1], "x": 1, "y": 1.417},
+                {"matrix": [1, 2], "x": 2, "y": 1.208},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.208},
+                {"matrix": [1, 5], "x": 5, "y": 1.417},
+
+                {"matrix": [1, 6], "x": 8.5, "y": 1.417},
+                {"matrix": [1, 7], "x": 9.5, "y": 1.208},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.208},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.417},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.625},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.625},
+                {"matrix": [2, 1], "x": 1, "y": 2.417},
+                {"matrix": [2, 2], "x": 2, "y": 2.208},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.208},
+                {"matrix": [2, 5], "x": 5, "y": 2.417},
+
+                {"matrix": [2, 6], "x": 8.5, "y": 2.417},
+                {"matrix": [2, 7], "x": 9.5, "y": 2.208},
+                {"matrix": [2, 8], "x": 10.5, "y": 2},
+                {"matrix": [2, 9], "x": 11.5, "y": 2.208},
+                {"matrix": [2, 10], "x": 12.5, "y": 2.417},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.625},
+
+                {"matrix": [3, 3], "x": 4, "y": 3.208},
+                {"matrix": [3, 4], "x": 5, "y": 3.417},
+                {"matrix": [3, 5], "x": 5.75, "y": 4.417},
+
+                {"matrix": [3, 6], "x": 7.75, "y": 4.417},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.417},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.208}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/42/rules.mk b/keyboards/handwired/42/rules.mk
index 0c5b506f63f..3437a35bdf1 100644
--- a/keyboards/handwired/42/rules.mk
+++ b/keyboards/handwired/42/rules.mk
@@ -1,17 +1,2 @@
 # 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 = 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
-
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json
deleted file mode 100644
index 173abdfb60a..00000000000
--- a/keyboards/handwired/aball/info.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "keyboard_name": "ABall",
-    "manufacturer": "Richard Sutherland",
-    "url": "https://github.com/brickbots/aball/",
-    "maintainer": "@brickbots",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xC2F0",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "direct": [
-            [null]
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/aball/keyboard.json b/keyboards/handwired/aball/keyboard.json
new file mode 100644
index 00000000000..6ab686c5186
--- /dev/null
+++ b/keyboards/handwired/aball/keyboard.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "ABall",
+    "manufacturer": "Richard Sutherland",
+    "url": "https://github.com/brickbots/aball/",
+    "maintainer": "@brickbots",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xC2F0",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": false,
+        "pointing_device": true
+    },
+    "matrix_pins": {
+        "direct": [
+            [null]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/aball/rules.mk b/keyboards/handwired/aball/rules.mk
index d5e8e6ab985..84de35aeb14 100644
--- a/keyboards/handwired/aball/rules.mk
+++ b/keyboards/handwired/aball/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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# Add trackball support
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/keyboard.json
similarity index 100%
rename from keyboards/handwired/alcor_dactyl/info.json
rename to keyboards/handwired/alcor_dactyl/keyboard.json
diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json
deleted file mode 100644
index 06ef96ba21e..00000000000
--- a/keyboards/handwired/battleship_gamepad/info.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "keyboard_name": "Battleship Gamepad",
-    "manufacturer": "arbraini",
-    "url": "https://github.com/abraini-Nascent/battleship_gamepad",
-    "maintainer": "arbraini",
-    "usb": {
-        "vid": "0x4142",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["B6", "B2", "B3", "B1", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-                {"x": 1, "y": 0, "matrix": [0, 1]},
-                {"x": 2.25, "y": 0, "w": 1.25, "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": [0, 7]},
-
-                {"x": 0, "y": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2.25, "y": 1, "w": 1.25, "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": 0, "y": 2, "matrix": [2, 0]},
-                {"x": 1, "y": 2, "matrix": [2, 1]},
-                {"x": 2.25, "y": 2, "w": 1.25, "matrix": [2, 2]},
-                {"x": 3.5, "y": 2, "matrix": [2, 3]},
-                {"x": 4.5, "y": 2, "matrix": [2, 4]},
-                {"x": 5.5, "y": 2, "matrix": [2, 5]},
-                {"x": 6.5, "y": 2, "matrix": [2, 6]},
-                {"x": 7.5, "y": 2, "matrix": [2, 7]},
-
-                {"x": 0, "y": 3, "matrix": [3, 0]},
-                {"x": 1, "y": 3, "matrix": [3, 1]},
-                {"x": 2.25, "y": 3, "w": 1.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": 0, "y": 4, "matrix": [4, 0]},
-                {"x": 1, "y": 4, "matrix": [4, 1]},
-                {"x": 2.25, "y": 4, "w": 1.25, "matrix": [4, 2]},
-                {"x": 3.5, "y": 4, "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": [4, 6]},
-                {"x": 7.5, "y": 4, "matrix": [4, 7]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/battleship_gamepad/keyboard.json b/keyboards/handwired/battleship_gamepad/keyboard.json
new file mode 100644
index 00000000000..3b4010ce40c
--- /dev/null
+++ b/keyboards/handwired/battleship_gamepad/keyboard.json
@@ -0,0 +1,75 @@
+{
+    "keyboard_name": "Battleship Gamepad",
+    "manufacturer": "arbraini",
+    "url": "https://github.com/abraini-Nascent/battleship_gamepad",
+    "maintainer": "arbraini",
+    "usb": {
+        "vid": "0x4142",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B6", "B2", "B3", "B1", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "joystick": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2.25, "y": 0, "w": 1.25, "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": [0, 7]},
+
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2.25, "y": 1, "w": 1.25, "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": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2.25, "y": 2, "w": 1.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2, "matrix": [2, 5]},
+                {"x": 6.5, "y": 2, "matrix": [2, 6]},
+                {"x": 7.5, "y": 2, "matrix": [2, 7]},
+
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2.25, "y": 3, "w": 1.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": 0, "y": 4, "matrix": [4, 0]},
+                {"x": 1, "y": 4, "matrix": [4, 1]},
+                {"x": 2.25, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.5, "y": 4, "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": [4, 6]},
+                {"x": 7.5, "y": 4, "matrix": [4, 7]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/battleship_gamepad/rules.mk b/keyboards/handwired/battleship_gamepad/rules.mk
index a41273f8900..c5ab560bca9 100644
--- a/keyboards/handwired/battleship_gamepad/rules.mk
+++ b/keyboards/handwired/battleship_gamepad/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-JOYSTICK_ENABLE = yes
 JOYSTICK_DRIVER = analog
diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json
deleted file mode 100644
index e5c94794537..00000000000
--- a/keyboards/handwired/bdn9_ble/info.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "keyboard_name": "BDN9-BLE",
-  "manufacturer": "KeyPCB/Keebio",
-  "url": "",
-  "maintainer": "merlin04",
-  "usb": {
-    "vid": "0xCB10",
-    "pid": "0x1134",
-    "device_version": "1.0.0"
-  },
-  "bluetooth": {
-    "driver": "bluefruit_le"
-  },
-  "backlight": {
-    "driver": "timer",
-    "pin": "F6",
-    "levels": 5
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "matrix_pins": {
-    "direct": [
-      ["D1", "D0", "C6"],
-      ["D7", "B5", "B6"],
-      ["B7", "D6", "F7"]
-    ]
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"x": 0, "y": 0, "matrix": [0, 0]},
-        {"x": 1, "y": 0, "matrix": [0, 1]},
-        {"x": 2, "y": 0, "matrix": [0, 2]},
-        {"x": 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/handwired/bdn9_ble/keyboard.json b/keyboards/handwired/bdn9_ble/keyboard.json
new file mode 100644
index 00000000000..76d9e42f83c
--- /dev/null
+++ b/keyboards/handwired/bdn9_ble/keyboard.json
@@ -0,0 +1,52 @@
+{
+  "keyboard_name": "BDN9-BLE",
+  "manufacturer": "KeyPCB/Keebio",
+  "url": "",
+  "maintainer": "merlin04",
+  "usb": {
+    "vid": "0xCB10",
+    "pid": "0x1134",
+    "device_version": "1.0.0"
+  },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
+  "backlight": {
+    "driver": "timer",
+    "pin": "F6",
+    "levels": 5
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "backlight": true,
+    "bluetooth": true
+  },
+  "matrix_pins": {
+    "direct": [
+      ["D1", "D0", "C6"],
+      ["D7", "B5", "B6"],
+      ["B7", "D6", "F7"]
+    ]
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 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/handwired/bdn9_ble/rules.mk b/keyboards/handwired/bdn9_ble/rules.mk
index 0dafe2f289e..3437a35bdf1 100644
--- a/keyboards/handwired/bdn9_ble/rules.mk
+++ b/keyboards/handwired/bdn9_ble/rules.mk
@@ -1,17 +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 = 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
-ENCODER_ENABLE = no
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
deleted file mode 100644
index 6730c14a361..00000000000
--- a/keyboards/handwired/bento/rev1/info.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "keyboard_name": "Bento Macropad Rev. 1",
-  "manufacturer": "GhostSeven",
-  "url": "https://www.thingiverse.com/thing:4416966",
-  "maintainer": "Ghostseven",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0xDAD3",
-    "device_version": "1.0.0"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 4,
-    "sleep": true,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "D1", "pin_b": "D0"}
-    ]
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "matrix_pins": {
-    "direct": [
-      ["D7", "B1", "D2"],
-      ["E6", "B4", "B2"]
-    ]
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"x": 0, "y": 0, "matrix": [0, 0]},
-        {"x": 1, "y": 0, "matrix": [0, 1]},
-        {"x": 2, "y": 0, "matrix": [0, 2]},
-        {"x": 0, "y": 1, "matrix": [1, 0]},
-        {"x": 1, "y": 1, "matrix": [1, 1]},
-        {"x": 2, "y": 1, "matrix": [1, 2]}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/bento/rev1/keyboard.json b/keyboards/handwired/bento/rev1/keyboard.json
new file mode 100644
index 00000000000..3baa7d77ce4
--- /dev/null
+++ b/keyboards/handwired/bento/rev1/keyboard.json
@@ -0,0 +1,66 @@
+{
+  "keyboard_name": "Bento Macropad Rev. 1",
+  "manufacturer": "GhostSeven",
+  "url": "https://www.thingiverse.com/thing:4416966",
+  "maintainer": "Ghostseven",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xDAD3",
+    "device_version": "1.0.0"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 4,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "D1", "pin_b": "D0"}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "rgblight": true,
+    "encoder": true
+  },
+  "matrix_pins": {
+    "direct": [
+      ["D7", "B1", "D2"],
+      ["E6", "B4", "B2"]
+    ]
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/bento/rev1/rules.mk b/keyboards/handwired/bento/rev1/rules.mk
deleted file mode 100644
index 6a4a0677378..00000000000
--- a/keyboards/handwired/bento/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 = 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
-ENCODER_ENABLE = yes
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
deleted file mode 100644
index 01ec6602b7c..00000000000
--- a/keyboards/handwired/brain/info.json
+++ /dev/null
@@ -1,112 +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": {
-        "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/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 6fe874e748b..00000000000
--- a/keyboards/handwired/brain/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 = 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/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json
deleted file mode 100644
index 9d1d47564a7..00000000000
--- a/keyboards/handwired/chiron/info.json
+++ /dev/null
@@ -1,118 +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": {
-        "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/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 61784649426..00000000000
--- a/keyboards/handwired/chiron/rules.mk
+++ /dev/null
@@ -1,16 +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
diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json
deleted file mode 100644
index 6b2db46b1f0..00000000000
--- a/keyboards/handwired/cyberstar/info.json
+++ /dev/null
@@ -1,402 +0,0 @@
-{
-    "keyboard_name": "Cyberstar",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x432A",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 12,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B4",
-        "driver": "pwm"
-    },
-    "matrix_pins": {
-        "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A10", "A14", "B8", "B9"],
-        "rows": ["A15", "B3", "A9", "B5", "A3"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_split_space_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_split_space": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
-                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
-                {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4},
-
-                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
-                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_split_space_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
-                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
-                {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4},
-
-                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
-                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_625u_space": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
-                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
-                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_625u_space_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
-                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
-                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/cyberstar/keyboard.json b/keyboards/handwired/cyberstar/keyboard.json
new file mode 100644
index 00000000000..344c576462d
--- /dev/null
+++ b/keyboards/handwired/cyberstar/keyboard.json
@@ -0,0 +1,409 @@
+{
+    "keyboard_name": "Cyberstar",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x432A",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B4",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A10", "A14", "B8", "B9"],
+        "rows": ["A15", "B3", "A9", "B5", "A3"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_split_space": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_split_space_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_625u_space": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_625u_space_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/cyberstar/rules.mk b/keyboards/handwired/cyberstar/rules.mk
index cc9d7bb3f53..0ab54aaaf71 100644
--- a/keyboards/handwired/cyberstar/rules.mk
+++ b/keyboards/handwired/cyberstar/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/handwired/d48/info.json b/keyboards/handwired/d48/info.json
deleted file mode 100644
index 295fead5879..00000000000
--- a/keyboards/handwired/d48/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "D48",
-    "manufacturer": "Andrew Dunai",
-    "url": "",
-    "maintainer": "and3rson",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "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": "A15"
-    },
-    "matrix_pins": {
-        "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"],
-        "rows": ["B8", "B9", "B1", "B2", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B3", "pin_b": "A6"},
-            {"pin_a": "A0", "pin_b": "A1"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 8], "x": 8, "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/handwired/d48/keyboard.json b/keyboards/handwired/d48/keyboard.json
new file mode 100644
index 00000000000..e5ee61093e9
--- /dev/null
+++ b/keyboards/handwired/d48/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "D48",
+    "manufacturer": "Andrew Dunai",
+    "url": "",
+    "maintainer": "and3rson",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "A15"
+    },
+    "matrix_pins": {
+        "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"],
+        "rows": ["B8", "B9", "B1", "B2", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "A6"},
+            {"pin_a": "A0", "pin_b": "A1"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "audio": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true,
+        "unicode": true
+    },
+    "board": "QMK_PROTON_C",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 8], "x": 8, "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/handwired/d48/rules.mk b/keyboards/handwired/d48/rules.mk
index 7fa8dfdd340..62866f887a6 100644
--- a/keyboards/handwired/d48/rules.mk
+++ b/keyboards/handwired/d48/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 = 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 = yes
-USE_I2C = no
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-UNICODE_ENABLE = yes
-
 SRC += ds1307.c taphold.c
diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json
deleted file mode 100644
index e95c380d9c0..00000000000
--- a/keyboards/handwired/dactyl/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "keyboard_name": "Dactyl",
-  "manufacturer": "Adereth",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1308",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "halfkay",
-  "debounce": 15,
-  "tapping": {
-    "toggle": 1
-  },
-  "layouts": {
-    "LAYOUT_dactyl": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-
-        {"matrix": [1, 0], "x": 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": [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": [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": 4},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 0], "x": 7, "y": 5},
-
-        {"matrix": [5, 4], "x": 7, "y": 6},
-        {"matrix": [5, 3], "x": 5, "y": 6, "h": 2},
-        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
-
-        {"matrix": [5, 1], "x": 7, "y": 7},
-
-        {"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": [0, 10], "x": 15, "y": 0},
-        {"matrix": [0, 11], "x": 16, "y": 0},
-
-        {"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": [1, 10], "x": 15, "y": 1},
-        {"matrix": [1, 11], "x": 16, "y": 1},
-
-        {"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": [2, 10], "x": 15, "y": 2},
-        {"matrix": [2, 11], "x": 16, "y": 2},
-
-        {"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": [3, 10], "x": 15, "y": 3},
-        {"matrix": [3, 11], "x": 16, "y": 3},
-
-        {"matrix": [4, 7], "x": 12, "y": 4},
-        {"matrix": [4, 8], "x": 13, "y": 4},
-        {"matrix": [4, 9], "x": 14, "y": 4},
-        {"matrix": [4, 10], "x": 15, "y": 4},
-        {"matrix": [4, 11], "x": 16, "y": 4},
-
-        {"matrix": [5, 11], "x": 9, "y": 5},
-        {"matrix": [5, 6], "x": 10, "y": 5},
-
-        {"matrix": [5, 7], "x": 9, "y": 6},
-
-        {"matrix": [5, 10], "x": 9, "y": 7},
-
-        {"matrix": [5, 9], "x": 10, "y": 6, "h": 2},
-        {"matrix": [5, 8], "x": 11, "y": 6, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/dactyl/keyboard.json b/keyboards/handwired/dactyl/keyboard.json
new file mode 100644
index 00000000000..339119e6fd4
--- /dev/null
+++ b/keyboards/handwired/dactyl/keyboard.json
@@ -0,0 +1,117 @@
+{
+  "keyboard_name": "Dactyl",
+  "manufacturer": "Adereth",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1308",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "halfkay",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "nkro": true,
+    "unicode": true,
+    "swap_hands": true
+  },
+  "debounce": 15,
+  "tapping": {
+    "toggle": 1
+  },
+  "layouts": {
+    "LAYOUT_dactyl": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [1, 0], "x": 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": [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": [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": 4},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 0], "x": 7, "y": 5},
+
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 3], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+
+        {"matrix": [5, 1], "x": 7, "y": 7},
+
+        {"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": [0, 10], "x": 15, "y": 0},
+        {"matrix": [0, 11], "x": 16, "y": 0},
+
+        {"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": [1, 10], "x": 15, "y": 1},
+        {"matrix": [1, 11], "x": 16, "y": 1},
+
+        {"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": [2, 10], "x": 15, "y": 2},
+        {"matrix": [2, 11], "x": 16, "y": 2},
+
+        {"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": [3, 10], "x": 15, "y": 3},
+        {"matrix": [3, 11], "x": 16, "y": 3},
+
+        {"matrix": [4, 7], "x": 12, "y": 4},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4},
+        {"matrix": [4, 11], "x": 16, "y": 4},
+
+        {"matrix": [5, 11], "x": 9, "y": 5},
+        {"matrix": [5, 6], "x": 10, "y": 5},
+
+        {"matrix": [5, 7], "x": 9, "y": 6},
+
+        {"matrix": [5, 10], "x": 9, "y": 7},
+
+        {"matrix": [5, 9], "x": 10, "y": 6, "h": 2},
+        {"matrix": [5, 8], "x": 11, "y": 6, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/dactyl/rules.mk b/keyboards/handwired/dactyl/rules.mk
index bffd901b04d..35b5df19738 100644
--- a/keyboards/handwired/dactyl/rules.mk
+++ b/keyboards/handwired/dactyl/rules.mk
@@ -1,17 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-POINTING_DEVICE_ENABLE  = no
-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
-CUSTOM_MATRIX           = yes # Custom matrix file for the Dactyl
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-UNICODE_ENABLE          = yes # Unicode
-SWAP_HANDS_ENABLE       = yes # Allow swapping hands of keyboard
-RGBLIGHT_ENABLE         = no
+CUSTOM_MATRIX           = yes
 
 # project specific files
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json
deleted file mode 100644
index 12f6f6397a0..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ /dev/null
@@ -1,143 +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": {
-        "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/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/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/rules.mk
deleted file mode 100644
index 3f2eac5940c..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/rules.mk
+++ /dev/null
@@ -1,12 +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
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 689b43c5bf5..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json
+++ /dev/null
@@ -1,82 +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": {
-        "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/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 7748be4c5b3..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
+++ /dev/null
@@ -1,11 +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
diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json
deleted file mode 100644
index 9305461f865..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ /dev/null
@@ -1,99 +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": {
-        "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/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/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/rules.mk
deleted file mode 100644
index 3f2eac5940c..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/rules.mk
+++ /dev/null
@@ -1,12 +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
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 9a879132a3e..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ /dev/null
@@ -1,196 +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": {
-        "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/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 3f2eac5940c..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk
+++ /dev/null
@@ -1,12 +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
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json
deleted file mode 100644
index 66658447487..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ /dev/null
@@ -1,113 +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": {
-        "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/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 3f2eac5940c..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/rules.mk
+++ /dev/null
@@ -1,12 +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
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 ec6a432cb24..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
+++ /dev/null
@@ -1,108 +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": {
-        "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/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 ab2c49da70e..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/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 = 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/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
deleted file mode 100644
index 14b0105cae2..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json
+++ /dev/null
@@ -1,104 +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": {
-        "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/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 3b6a1809db1..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
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 6a2b00ffffa..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json
+++ /dev/null
@@ -1,105 +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": {
-        "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/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 e70d1927dee..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
+++ /dev/null
@@ -1,12 +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
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
deleted file mode 100644
index 8f1cfe5d17d..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ /dev/null
@@ -1,123 +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": {
-        "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/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 3f2eac5940c..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/rules.mk
+++ /dev/null
@@ -1,12 +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
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
deleted file mode 100644
index 905ed5cc3fe..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B1", "B0", "A7", "A6", "A5", "A4"],
-        "rows": ["B12", "B13", "B14", "B15", "A8", "A9", "A10"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "bootmagic": {
-            "matrix": [7, 0]
-        }
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
new file mode 100644
index 00000000000..9ab62df2373
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
@@ -0,0 +1,23 @@
+{
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["B12", "B13", "B14", "B15", "A8", "A9", "A10"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "bootmagic": {
+            "matrix": [7, 0]
+        }
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "board": "BLACKPILL_STM32_F411"
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
index c6228f59ed7..c018471cadc 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/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 = 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 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 e9b1152d664..0ec00196ba5 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
@@ -15,5 +15,11 @@
         "pin": "D3"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true
+    }
 }
diff --git a/keyboards/handwired/dactyl_manuform/6x6/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
index 389d7509f00..29194b429ef 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
@@ -1,14 +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
-
 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 e9b0eb40295..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ /dev/null
@@ -1,131 +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": {
-        "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/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 3f2eac5940c..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
+++ /dev/null
@@ -1,12 +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
diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json
deleted file mode 100644
index 3c354bbcec4..00000000000
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ /dev/null
@@ -1,117 +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": {
-        "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/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 d68e4764c51..00000000000
--- a/keyboards/handwired/dactyl_promicro/rules.mk
+++ /dev/null
@@ -1,12 +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. 
diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json
deleted file mode 100644
index 6cd23a54cf0..00000000000
--- a/keyboards/handwired/dactyl_rah/info.json
+++ /dev/null
@@ -1,116 +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": {
-    "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/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 3f2eac5940c..00000000000
--- a/keyboards/handwired/dactyl_rah/rules.mk
+++ /dev/null
@@ -1,12 +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
diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json
deleted file mode 100644
index 372619565da..00000000000
--- a/keyboards/handwired/datahand/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "keyboard_name": "DataHand",
-    "manufacturer": "DataHand",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x13BA",
-        "pid": "0x0017",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "processor": "at90usb1286",
-    "bootloader": "halfkay",
-    "debounce": 0,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 3], "x": 1, "y": 2.75},
-                {"matrix": [3, 3], "x": 3.25, "y": 1.25},
-
-                {"matrix": [5, 3], "x": 5.75, "y": 0},
-                {"matrix": [8, 3], "x": 9, "y": 0.75},
-
-                {"matrix": [0, 1], "x": 13, "y": 0.75},
-                {"matrix": [3, 1], "x": 16.25, "y": 0},
-
-                {"matrix": [5, 1], "x": 18.75, "y": 1.25},
-                {"matrix": [8, 1], "x": 21, "y": 2.75},
-
-                {"matrix": [0, 2], "x": 0, "y": 3.75},
-                {"matrix": [1, 2], "x": 1, "y": 3.75},
-                {"matrix": [1, 3], "x": 2, "y": 3.75},
-
-                {"matrix": [3, 2], "x": 2.25, "y": 2.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 2.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 2.25},
-
-                {"matrix": [5, 2], "x": 4.75, "y": 1},
-                {"matrix": [6, 2], "x": 5.75, "y": 1},
-                {"matrix": [6, 3], "x": 6.75, "y": 1},
-
-                {"matrix": [8, 2], "x": 8, "y": 1.75},
-                {"matrix": [9, 2], "x": 9, "y": 1.75},
-                {"matrix": [9, 3], "x": 10, "y": 1.75},
-
-                {"matrix": [0, 0], "x": 12, "y": 1.75},
-                {"matrix": [1, 0], "x": 13, "y": 1.75},
-                {"matrix": [1, 1], "x": 14, "y": 1.75},
-
-                {"matrix": [3, 0], "x": 15.25, "y": 1},
-                {"matrix": [4, 0], "x": 16.25, "y": 1},
-                {"matrix": [4, 1], "x": 17.25, "y": 1},
-
-                {"matrix": [5, 0], "x": 17.75, "y": 2.25},
-                {"matrix": [6, 0], "x": 18.75, "y": 2.25},
-                {"matrix": [6, 1], "x": 19.75, "y": 2.25},
-
-                {"matrix": [8, 0], "x": 20, "y": 3.75},
-                {"matrix": [9, 0], "x": 21, "y": 3.75},
-                {"matrix": [9, 1], "x": 22, "y": 3.75},
-
-                {"matrix": [2, 2], "x": 1, "y": 4.75},
-                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
-
-                {"matrix": [7, 2], "x": 5.75, "y": 2},
-                {"matrix": [7, 3], "x": 9, "y": 2.75},
-
-                {"matrix": [2, 0], "x": 13, "y": 2.75},
-                {"matrix": [2, 1], "x": 16.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 18.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 21, "y": 4.75},
-
-                {"matrix": [12, 2], "x": 8, "y": 4.75},
-                {"matrix": [10, 3], "x": 10, "y": 4.75},
-                {"matrix": [10, 1], "x": 12, "y": 4.75},
-                {"matrix": [12, 0], "x": 14, "y": 4.75},
-
-                {"matrix": [11, 2], "x": 9, "y": 5.25},
-                {"matrix": [11, 0], "x": 13, "y": 5.25},
-
-                {"matrix": [11, 3], "x": 9, "y": 6.25},
-                {"matrix": [11, 1], "x": 13, "y": 6.25},
-
-                {"matrix": [12, 3], "x": 8, "y": 6.75},
-                {"matrix": [10, 2], "x": 10, "y": 6.75},
-                {"matrix": [10, 0], "x": 12, "y": 6.75},
-                {"matrix": [12, 1], "x": 14, "y": 6.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/datahand/keyboard.json b/keyboards/handwired/datahand/keyboard.json
new file mode 100644
index 00000000000..96e49388dc8
--- /dev/null
+++ b/keyboards/handwired/datahand/keyboard.json
@@ -0,0 +1,100 @@
+{
+    "keyboard_name": "DataHand",
+    "manufacturer": "DataHand",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x13BA",
+        "pid": "0x0017",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "processor": "at90usb1286",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
+    "debounce": 0,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 3], "x": 1, "y": 2.75},
+                {"matrix": [3, 3], "x": 3.25, "y": 1.25},
+
+                {"matrix": [5, 3], "x": 5.75, "y": 0},
+                {"matrix": [8, 3], "x": 9, "y": 0.75},
+
+                {"matrix": [0, 1], "x": 13, "y": 0.75},
+                {"matrix": [3, 1], "x": 16.25, "y": 0},
+
+                {"matrix": [5, 1], "x": 18.75, "y": 1.25},
+                {"matrix": [8, 1], "x": 21, "y": 2.75},
+
+                {"matrix": [0, 2], "x": 0, "y": 3.75},
+                {"matrix": [1, 2], "x": 1, "y": 3.75},
+                {"matrix": [1, 3], "x": 2, "y": 3.75},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 2.25},
+
+                {"matrix": [5, 2], "x": 4.75, "y": 1},
+                {"matrix": [6, 2], "x": 5.75, "y": 1},
+                {"matrix": [6, 3], "x": 6.75, "y": 1},
+
+                {"matrix": [8, 2], "x": 8, "y": 1.75},
+                {"matrix": [9, 2], "x": 9, "y": 1.75},
+                {"matrix": [9, 3], "x": 10, "y": 1.75},
+
+                {"matrix": [0, 0], "x": 12, "y": 1.75},
+                {"matrix": [1, 0], "x": 13, "y": 1.75},
+                {"matrix": [1, 1], "x": 14, "y": 1.75},
+
+                {"matrix": [3, 0], "x": 15.25, "y": 1},
+                {"matrix": [4, 0], "x": 16.25, "y": 1},
+                {"matrix": [4, 1], "x": 17.25, "y": 1},
+
+                {"matrix": [5, 0], "x": 17.75, "y": 2.25},
+                {"matrix": [6, 0], "x": 18.75, "y": 2.25},
+                {"matrix": [6, 1], "x": 19.75, "y": 2.25},
+
+                {"matrix": [8, 0], "x": 20, "y": 3.75},
+                {"matrix": [9, 0], "x": 21, "y": 3.75},
+                {"matrix": [9, 1], "x": 22, "y": 3.75},
+
+                {"matrix": [2, 2], "x": 1, "y": 4.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
+
+                {"matrix": [7, 2], "x": 5.75, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2.75},
+
+                {"matrix": [2, 0], "x": 13, "y": 2.75},
+                {"matrix": [2, 1], "x": 16.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 18.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 21, "y": 4.75},
+
+                {"matrix": [12, 2], "x": 8, "y": 4.75},
+                {"matrix": [10, 3], "x": 10, "y": 4.75},
+                {"matrix": [10, 1], "x": 12, "y": 4.75},
+                {"matrix": [12, 0], "x": 14, "y": 4.75},
+
+                {"matrix": [11, 2], "x": 9, "y": 5.25},
+                {"matrix": [11, 0], "x": 13, "y": 5.25},
+
+                {"matrix": [11, 3], "x": 9, "y": 6.25},
+                {"matrix": [11, 1], "x": 13, "y": 6.25},
+
+                {"matrix": [12, 3], "x": 8, "y": 6.75},
+                {"matrix": [10, 2], "x": 10, "y": 6.75},
+                {"matrix": [10, 0], "x": 12, "y": 6.75},
+                {"matrix": [12, 1], "x": 14, "y": 6.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/datahand/rules.mk b/keyboards/handwired/datahand/rules.mk
index 447e7fdc02c..a0a4f497e13 100644
--- a/keyboards/handwired/datahand/rules.mk
+++ b/keyboards/handwired/datahand/rules.mk
@@ -1,15 +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    = 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
-CUSTOM_MATRIX     = yes  # We definitely have a nonstandard matrix
+CUSTOM_MATRIX     = yes
 
 # Project specific files
 SRC = matrix.c
diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json
deleted file mode 100644
index 4df41850109..00000000000
--- a/keyboards/handwired/dqz11n1g/info.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-    "keyboard_name": "DQz11N1G",
-    "manufacturer": "Unknown",
-    "url": "https://github.com/dvdkhlng/qmk_firmware_dqz11n1g",
-    "maintainer": "dvdkhlng",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x4451",
-        "device_version": "0.0.1"
-    },
-    "indicators": {
-        "caps_lock": "F7",
-        "num_lock": "F5",
-        "scroll_lock": "F4"
-    },
-    "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": 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": 15, "y": 0},
-                {"matrix": [0, 14], "x": 16, "y": 0},
-                {"matrix": [0, 15], "x": 17, "y": 0},
-                {"matrix": [0, 16], "x": 18, "y": 0},
-                {"matrix": [0, 17], "x": 19, "y": 0},
-                {"matrix": [0, 18], "x": 20, "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": 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": 15, "y": 1},
-                {"matrix": [1, 14], "x": 16, "y": 1},
-                {"matrix": [1, 15], "x": 17, "y": 1},
-                {"matrix": [1, 16], "x": 18, "y": 1},
-                {"matrix": [1, 17], "x": 19, "y": 1},
-                {"matrix": [1, 18], "x": 20, "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": 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": 15, "y": 2},
-                {"matrix": [2, 14], "x": 16, "y": 2},
-                {"matrix": [2, 15], "x": 17, "y": 2},
-                {"matrix": [2, 16], "x": 18, "y": 2},
-                {"matrix": [2, 17], "x": 19, "y": 2},
-                {"matrix": [2, 18], "x": 20, "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": 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": 15, "y": 3},
-                {"matrix": [3, 14], "x": 16, "y": 3},
-                {"matrix": [3, 15], "x": 17, "y": 3},
-                {"matrix": [3, 16], "x": 18, "y": 3},
-                {"matrix": [3, 17], "x": 19, "y": 3},
-                {"matrix": [3, 18], "x": 20, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "h": 2},
-                {"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, 13], "x": 15, "y": 4},
-                {"matrix": [4, 14], "x": 16, "y": 4},
-                {"matrix": [4, 15], "x": 17, "y": 4},
-                {"matrix": [4, 16], "x": 18, "y": 4},
-                {"matrix": [4, 17], "x": 19, "y": 4},
-                {"matrix": [4, 18], "x": 20, "y": 4, "h": 2},
-
-                {"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, 14], "x": 16, "y": 5},
-                {"matrix": [5, 15], "x": 17, "y": 5},
-                {"matrix": [5, 16], "x": 18, "y": 5},
-                {"matrix": [5, 17], "x": 19, "y": 5},
-
-                {"matrix": [4, 6], "x": 5, "y": 7},
-                {"matrix": [4, 7], "x": 6, "y": 7},
-                {"matrix": [4, 8], "x": 7, "y": 7},
-
-                {"matrix": [4, 10], "x": 13, "y": 7},
-                {"matrix": [4, 11], "x": 14, "y": 7},
-                {"matrix": [4, 12], "x": 15, "y": 7},
-
-                {"matrix": [5, 6], "x": 5, "y": 8, "h": 2},
-                {"matrix": [5, 7], "x": 6, "y": 8, "h": 2},
-                {"matrix": [5, 8], "x": 7, "y": 8},
-
-                {"matrix": [5, 10], "x": 13, "y": 8},
-                {"matrix": [5, 11], "x": 14, "y": 8, "h": 2},
-                {"matrix": [5, 12], "x": 15, "y": 8, "h": 2},
-
-                {"matrix": [6, 8], "x": 7, "y": 9},
-
-                {"matrix": [6, 10], "x": 13, "y": 9}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dqz11n1g/keyboard.json b/keyboards/handwired/dqz11n1g/keyboard.json
new file mode 100644
index 00000000000..4e45a5a920c
--- /dev/null
+++ b/keyboards/handwired/dqz11n1g/keyboard.json
@@ -0,0 +1,162 @@
+{
+    "keyboard_name": "DQz11N1G",
+    "manufacturer": "Unknown",
+    "url": "https://github.com/dvdkhlng/qmk_firmware_dqz11n1g",
+    "maintainer": "dvdkhlng",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x4451",
+        "device_version": "0.0.1"
+    },
+    "indicators": {
+        "caps_lock": "F7",
+        "num_lock": "F5",
+        "scroll_lock": "F4"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": 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": [0, 5], "x": 5, "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": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0},
+                {"matrix": [0, 15], "x": 17, "y": 0},
+                {"matrix": [0, 16], "x": 18, "y": 0},
+                {"matrix": [0, 17], "x": 19, "y": 0},
+                {"matrix": [0, 18], "x": 20, "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": 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": 15, "y": 1},
+                {"matrix": [1, 14], "x": 16, "y": 1},
+                {"matrix": [1, 15], "x": 17, "y": 1},
+                {"matrix": [1, 16], "x": 18, "y": 1},
+                {"matrix": [1, 17], "x": 19, "y": 1},
+                {"matrix": [1, 18], "x": 20, "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": 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": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2},
+                {"matrix": [2, 15], "x": 17, "y": 2},
+                {"matrix": [2, 16], "x": 18, "y": 2},
+                {"matrix": [2, 17], "x": 19, "y": 2},
+                {"matrix": [2, 18], "x": 20, "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": 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": 15, "y": 3},
+                {"matrix": [3, 14], "x": 16, "y": 3},
+                {"matrix": [3, 15], "x": 17, "y": 3},
+                {"matrix": [3, 16], "x": 18, "y": 3},
+                {"matrix": [3, 17], "x": 19, "y": 3},
+                {"matrix": [3, 18], "x": 20, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "h": 2},
+                {"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, 13], "x": 15, "y": 4},
+                {"matrix": [4, 14], "x": 16, "y": 4},
+                {"matrix": [4, 15], "x": 17, "y": 4},
+                {"matrix": [4, 16], "x": 18, "y": 4},
+                {"matrix": [4, 17], "x": 19, "y": 4},
+                {"matrix": [4, 18], "x": 20, "y": 4, "h": 2},
+
+                {"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, 14], "x": 16, "y": 5},
+                {"matrix": [5, 15], "x": 17, "y": 5},
+                {"matrix": [5, 16], "x": 18, "y": 5},
+                {"matrix": [5, 17], "x": 19, "y": 5},
+
+                {"matrix": [4, 6], "x": 5, "y": 7},
+                {"matrix": [4, 7], "x": 6, "y": 7},
+                {"matrix": [4, 8], "x": 7, "y": 7},
+
+                {"matrix": [4, 10], "x": 13, "y": 7},
+                {"matrix": [4, 11], "x": 14, "y": 7},
+                {"matrix": [4, 12], "x": 15, "y": 7},
+
+                {"matrix": [5, 6], "x": 5, "y": 8, "h": 2},
+                {"matrix": [5, 7], "x": 6, "y": 8, "h": 2},
+                {"matrix": [5, 8], "x": 7, "y": 8},
+
+                {"matrix": [5, 10], "x": 13, "y": 8},
+                {"matrix": [5, 11], "x": 14, "y": 8, "h": 2},
+                {"matrix": [5, 12], "x": 15, "y": 8, "h": 2},
+
+                {"matrix": [6, 8], "x": 7, "y": 9},
+
+                {"matrix": [6, 10], "x": 13, "y": 9}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dqz11n1g/rules.mk b/keyboards/handwired/dqz11n1g/rules.mk
index 220e353ab77..d998c6a8843 100644
--- a/keyboards/handwired/dqz11n1g/rules.mk
+++ b/keyboards/handwired/dqz11n1g/rules.mk
@@ -2,17 +2,3 @@
 CUSTOM_MATRIX = lite
 SRC += matrix.c 
 SPI_DRIVER_REQUIRED = yes
-
-# 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 = yes          # Audio output
-
diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json
index b9bcd2e639c..112a8a6abe2 100644
--- a/keyboards/handwired/dygma/raise/info.json
+++ b/keyboards/handwired/dygma/raise/info.json
@@ -26,6 +26,12 @@
     },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "board": "BLACKPILL_STM32_F411",
     "debounce": 0
 }
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
index ecf156629aa..7a078c9757b 100644
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/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
-RGB_MATRIX_ENABLE = yes
 CUSTOM_MATRIX = lite
 
 # TODO(ibash) we don't actually need to enable raw, but there's some side effect
diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json
deleted file mode 100644
index ea54669232d..00000000000
--- a/keyboards/handwired/elrgo_s/info.json
+++ /dev/null
@@ -1,83 +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": {
-        "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/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 ab2c49da70e..00000000000
--- a/keyboards/handwired/elrgo_s/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 = 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/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json
deleted file mode 100644
index 8d031b3c42f..00000000000
--- a/keyboards/handwired/frenchdev/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "keyboard_name": "Frenchdev V1",
-  "manufacturer": "Nicolas Poirey",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1307",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "halfkay",
-  "tapping": {
-    "toggle": 1
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [14, 5], "x": 1, "y": 0.9},
-        {"matrix": [13, 5], "x": 2, "y": 0.3},
-        {"matrix": [12, 5], "x": 3, "y": 0},
-        {"matrix": [11, 5], "x": 4, "y": 0.4},
-        {"matrix": [10, 5], "x": 5, "y": 0.5},
-        {"matrix": [9, 5], "x": 6, "y": 0.5},
-
-        {"matrix": [6, 5], "x": 13, "y": 0.5},
-        {"matrix": [5, 5], "x": 14, "y": 0.5},
-        {"matrix": [4, 5], "x": 15, "y": 0.4},
-        {"matrix": [3, 5], "x": 16, "y": 0},
-        {"matrix": [2, 5], "x": 17, "y": 0.3},
-        {"matrix": [1, 5], "x": 18, "y": 0.9},
-
-        {"matrix": [15, 4], "x": 0, "y": 1.9},
-        {"matrix": [14, 4], "x": 1, "y": 1.9},
-        {"matrix": [13, 4], "x": 2, "y": 1.3},
-        {"matrix": [12, 4], "x": 3, "y": 1},
-        {"matrix": [11, 4], "x": 4, "y": 1.4},
-        {"matrix": [10, 4], "x": 5, "y": 1.5},
-        {"matrix": [9, 4], "x": 6, "y": 1.5},
-
-        {"matrix": [6, 4], "x": 13, "y": 1.5},
-        {"matrix": [5, 4], "x": 14, "y": 1.5},
-        {"matrix": [4, 4], "x": 15, "y": 1.4},
-        {"matrix": [3, 4], "x": 16, "y": 1},
-        {"matrix": [2, 4], "x": 17, "y": 1.3},
-        {"matrix": [1, 4], "x": 18, "y": 1.9},
-        {"matrix": [0, 4], "x": 19, "y": 1.9},
-
-        {"matrix": [15, 3], "x": 0, "y": 2.9},
-        {"matrix": [14, 3], "x": 1, "y": 2.9},
-        {"matrix": [13, 3], "x": 2, "y": 2.3},
-        {"matrix": [12, 3], "x": 3, "y": 2},
-        {"matrix": [11, 3], "x": 4, "y": 2.4},
-        {"matrix": [10, 3], "x": 5, "y": 2.5},
-        {"matrix": [9, 3], "x": 6, "y": 2.5},
-
-        {"matrix": [6, 3], "x": 13, "y": 2.5},
-        {"matrix": [5, 3], "x": 14, "y": 2.5},
-        {"matrix": [4, 3], "x": 15, "y": 2.4},
-        {"matrix": [3, 3], "x": 16, "y": 2},
-        {"matrix": [2, 3], "x": 17, "y": 2.3},
-        {"matrix": [1, 3], "x": 18, "y": 2.9},
-        {"matrix": [0, 3], "x": 19, "y": 2.9},
-
-        {"matrix": [15, 2], "x": 0, "y": 3.9},
-        {"matrix": [14, 2], "x": 1, "y": 3.9},
-        {"matrix": [13, 2], "x": 2, "y": 3.3},
-        {"matrix": [12, 2], "x": 3, "y": 3},
-        {"matrix": [11, 2], "x": 4, "y": 3.4},
-        {"matrix": [10, 2], "x": 5, "y": 3.5},
-        {"matrix": [9, 2], "x": 6, "y": 3.5},
-
-        {"matrix": [6, 2], "x": 13, "y": 3.5},
-        {"matrix": [5, 2], "x": 14, "y": 3.5},
-        {"matrix": [4, 2], "x": 15, "y": 3.4},
-        {"matrix": [3, 2], "x": 16, "y": 3},
-        {"matrix": [2, 2], "x": 17, "y": 3.3},
-        {"matrix": [1, 2], "x": 18, "y": 3.9},
-        {"matrix": [0, 2], "x": 19, "y": 3.9},
-
-        {"matrix": [15, 1], "x": 0, "y": 4.9},
-        {"matrix": [14, 1], "x": 1, "y": 4.9},
-        {"matrix": [13, 1], "x": 2, "y": 4.3},
-        {"matrix": [12, 1], "x": 3, "y": 4},
-        {"matrix": [11, 1], "x": 4, "y": 4.4},
-        {"matrix": [10, 1], "x": 5, "y": 4.5},
-
-        {"matrix": [9, 1], "x": 6.5, "y": 5},
-        {"matrix": [8, 1], "x": 7.5, "y": 5},
-        {"matrix": [8, 2], "x": 8.5, "y": 5},
-
-        {"matrix": [7, 2], "x": 10.5, "y": 5},
-        {"matrix": [7, 1], "x": 11.5, "y": 5},
-        {"matrix": [6, 1], "x": 12.5, "y": 5},
-
-        {"matrix": [5, 1], "x": 14, "y": 4.5},
-        {"matrix": [4, 1], "x": 15, "y": 4.4},
-        {"matrix": [3, 1], "x": 16, "y": 4},
-        {"matrix": [2, 1], "x": 17, "y": 4.3},
-        {"matrix": [1, 1], "x": 18, "y": 4.9},
-        {"matrix": [0, 1], "x": 19, "y": 4.9},
-
-        {"matrix": [15, 0], "x": 0, "y": 5.9},
-        {"matrix": [14, 0], "x": 1, "y": 5.9},
-        {"matrix": [13, 0], "x": 2, "y": 5.3},
-        {"matrix": [12, 0], "x": 3, "y": 5},
-        {"matrix": [11, 0], "x": 4, "y": 5.4},
-        {"matrix": [10, 0], "x": 5, "y": 5.5},
-
-        {"matrix": [9, 0], "x": 6.5, "y": 6},
-        {"matrix": [8, 0], "x": 7.5, "y": 6},
-
-        {"matrix": [7, 0], "x": 11.5, "y": 6},
-        {"matrix": [6, 0], "x": 12.5, "y": 6},
-
-        {"matrix": [5, 0], "x": 14, "y": 5.5},
-        {"matrix": [4, 0], "x": 15, "y": 5.4},
-        {"matrix": [3, 0], "x": 16, "y": 5},
-        {"matrix": [2, 0], "x": 17, "y": 5.3},
-        {"matrix": [1, 0], "x": 18, "y": 5.9},
-        {"matrix": [0, 0], "x": 19, "y": 5.9},
-
-        {"matrix": [8, 3], "x": 2.25, "y": 7.5, "w": 1.75, "h": 2},
-        {"matrix": [8, 4], "x": 4, "y": 7.5, "w": 1.75, "h": 2},
-
-        {"matrix": [8, 5], "x": 5.75, "y": 7.5, "w": 1.75, "h": 2},
-
-        {"matrix": [7, 3], "x": 12.5, "y": 7.5, "w": 1.75, "h": 2},
-        {"matrix": [7, 4], "x": 14.25, "y": 7.5, "w": 1.75, "h": 2},
-
-        {"matrix": [7, 5], "x": 16, "y": 7.5, "w": 1.75, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/frenchdev/keyboard.json b/keyboards/handwired/frenchdev/keyboard.json
new file mode 100644
index 00000000000..ab811888a9a
--- /dev/null
+++ b/keyboards/handwired/frenchdev/keyboard.json
@@ -0,0 +1,142 @@
+{
+  "keyboard_name": "Frenchdev V1",
+  "manufacturer": "Nicolas Poirey",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1307",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "halfkay",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "tapping": {
+    "toggle": 1
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [14, 5], "x": 1, "y": 0.9},
+        {"matrix": [13, 5], "x": 2, "y": 0.3},
+        {"matrix": [12, 5], "x": 3, "y": 0},
+        {"matrix": [11, 5], "x": 4, "y": 0.4},
+        {"matrix": [10, 5], "x": 5, "y": 0.5},
+        {"matrix": [9, 5], "x": 6, "y": 0.5},
+
+        {"matrix": [6, 5], "x": 13, "y": 0.5},
+        {"matrix": [5, 5], "x": 14, "y": 0.5},
+        {"matrix": [4, 5], "x": 15, "y": 0.4},
+        {"matrix": [3, 5], "x": 16, "y": 0},
+        {"matrix": [2, 5], "x": 17, "y": 0.3},
+        {"matrix": [1, 5], "x": 18, "y": 0.9},
+
+        {"matrix": [15, 4], "x": 0, "y": 1.9},
+        {"matrix": [14, 4], "x": 1, "y": 1.9},
+        {"matrix": [13, 4], "x": 2, "y": 1.3},
+        {"matrix": [12, 4], "x": 3, "y": 1},
+        {"matrix": [11, 4], "x": 4, "y": 1.4},
+        {"matrix": [10, 4], "x": 5, "y": 1.5},
+        {"matrix": [9, 4], "x": 6, "y": 1.5},
+
+        {"matrix": [6, 4], "x": 13, "y": 1.5},
+        {"matrix": [5, 4], "x": 14, "y": 1.5},
+        {"matrix": [4, 4], "x": 15, "y": 1.4},
+        {"matrix": [3, 4], "x": 16, "y": 1},
+        {"matrix": [2, 4], "x": 17, "y": 1.3},
+        {"matrix": [1, 4], "x": 18, "y": 1.9},
+        {"matrix": [0, 4], "x": 19, "y": 1.9},
+
+        {"matrix": [15, 3], "x": 0, "y": 2.9},
+        {"matrix": [14, 3], "x": 1, "y": 2.9},
+        {"matrix": [13, 3], "x": 2, "y": 2.3},
+        {"matrix": [12, 3], "x": 3, "y": 2},
+        {"matrix": [11, 3], "x": 4, "y": 2.4},
+        {"matrix": [10, 3], "x": 5, "y": 2.5},
+        {"matrix": [9, 3], "x": 6, "y": 2.5},
+
+        {"matrix": [6, 3], "x": 13, "y": 2.5},
+        {"matrix": [5, 3], "x": 14, "y": 2.5},
+        {"matrix": [4, 3], "x": 15, "y": 2.4},
+        {"matrix": [3, 3], "x": 16, "y": 2},
+        {"matrix": [2, 3], "x": 17, "y": 2.3},
+        {"matrix": [1, 3], "x": 18, "y": 2.9},
+        {"matrix": [0, 3], "x": 19, "y": 2.9},
+
+        {"matrix": [15, 2], "x": 0, "y": 3.9},
+        {"matrix": [14, 2], "x": 1, "y": 3.9},
+        {"matrix": [13, 2], "x": 2, "y": 3.3},
+        {"matrix": [12, 2], "x": 3, "y": 3},
+        {"matrix": [11, 2], "x": 4, "y": 3.4},
+        {"matrix": [10, 2], "x": 5, "y": 3.5},
+        {"matrix": [9, 2], "x": 6, "y": 3.5},
+
+        {"matrix": [6, 2], "x": 13, "y": 3.5},
+        {"matrix": [5, 2], "x": 14, "y": 3.5},
+        {"matrix": [4, 2], "x": 15, "y": 3.4},
+        {"matrix": [3, 2], "x": 16, "y": 3},
+        {"matrix": [2, 2], "x": 17, "y": 3.3},
+        {"matrix": [1, 2], "x": 18, "y": 3.9},
+        {"matrix": [0, 2], "x": 19, "y": 3.9},
+
+        {"matrix": [15, 1], "x": 0, "y": 4.9},
+        {"matrix": [14, 1], "x": 1, "y": 4.9},
+        {"matrix": [13, 1], "x": 2, "y": 4.3},
+        {"matrix": [12, 1], "x": 3, "y": 4},
+        {"matrix": [11, 1], "x": 4, "y": 4.4},
+        {"matrix": [10, 1], "x": 5, "y": 4.5},
+
+        {"matrix": [9, 1], "x": 6.5, "y": 5},
+        {"matrix": [8, 1], "x": 7.5, "y": 5},
+        {"matrix": [8, 2], "x": 8.5, "y": 5},
+
+        {"matrix": [7, 2], "x": 10.5, "y": 5},
+        {"matrix": [7, 1], "x": 11.5, "y": 5},
+        {"matrix": [6, 1], "x": 12.5, "y": 5},
+
+        {"matrix": [5, 1], "x": 14, "y": 4.5},
+        {"matrix": [4, 1], "x": 15, "y": 4.4},
+        {"matrix": [3, 1], "x": 16, "y": 4},
+        {"matrix": [2, 1], "x": 17, "y": 4.3},
+        {"matrix": [1, 1], "x": 18, "y": 4.9},
+        {"matrix": [0, 1], "x": 19, "y": 4.9},
+
+        {"matrix": [15, 0], "x": 0, "y": 5.9},
+        {"matrix": [14, 0], "x": 1, "y": 5.9},
+        {"matrix": [13, 0], "x": 2, "y": 5.3},
+        {"matrix": [12, 0], "x": 3, "y": 5},
+        {"matrix": [11, 0], "x": 4, "y": 5.4},
+        {"matrix": [10, 0], "x": 5, "y": 5.5},
+
+        {"matrix": [9, 0], "x": 6.5, "y": 6},
+        {"matrix": [8, 0], "x": 7.5, "y": 6},
+
+        {"matrix": [7, 0], "x": 11.5, "y": 6},
+        {"matrix": [6, 0], "x": 12.5, "y": 6},
+
+        {"matrix": [5, 0], "x": 14, "y": 5.5},
+        {"matrix": [4, 0], "x": 15, "y": 5.4},
+        {"matrix": [3, 0], "x": 16, "y": 5},
+        {"matrix": [2, 0], "x": 17, "y": 5.3},
+        {"matrix": [1, 0], "x": 18, "y": 5.9},
+        {"matrix": [0, 0], "x": 19, "y": 5.9},
+
+        {"matrix": [8, 3], "x": 2.25, "y": 7.5, "w": 1.75, "h": 2},
+        {"matrix": [8, 4], "x": 4, "y": 7.5, "w": 1.75, "h": 2},
+
+        {"matrix": [8, 5], "x": 5.75, "y": 7.5, "w": 1.75, "h": 2},
+
+        {"matrix": [7, 3], "x": 12.5, "y": 7.5, "w": 1.75, "h": 2},
+        {"matrix": [7, 4], "x": 14.25, "y": 7.5, "w": 1.75, "h": 2},
+
+        {"matrix": [7, 5], "x": 16, "y": 7.5, "w": 1.75, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk
index e226d0b5172..9b396b76686 100644
--- a/keyboards/handwired/frenchdev/rules.mk
+++ b/keyboards/handwired/frenchdev/rules.mk
@@ -1,16 +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   = yes  # Console for debug
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-CUSTOM_MATRIX    = yes # Custom matrix file (taken and adapted from the ErgoDox EZ to handle custom number of columns)
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no
+CUSTOM_MATRIX    = yes
 
 # project specific files
 SRC = matrix.c
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json
deleted file mode 100644
index 04ba446e702..00000000000
--- a/keyboards/handwired/freoduo/info.json
+++ /dev/null
@@ -1,120 +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": {
-    "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/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 89a6989a8c6..00000000000
--- a/keyboards/handwired/freoduo/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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-VELOCIKEY_ENABLE = yes
diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json
deleted file mode 100644
index 34b1edc8207..00000000000
--- a/keyboards/handwired/fruity60/info.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "keyboard_name": "fruity60",
-    "manufacturer": "yanfali",
-    "url": "https://github.com/yanfali/fruity60",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xB170",
-        "device_version": "0.0.1"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "B7", "D6", "C7"],
-        "rows": ["B6", "B5", "D7", "C6", "D0", "D1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["60_tsangan_hhkb"],
-    "layouts": {
-        "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": [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": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "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.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": [5, 7], "x": 11.75, "y": 2},
-                {"matrix": [5, 8], "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": [5, 9], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [5, 10], "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, 8], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 9], "x": 12.5, "y": 4},
-                {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/fruity60/keyboard.json b/keyboards/handwired/fruity60/keyboard.json
new file mode 100644
index 00000000000..4984f3fc03c
--- /dev/null
+++ b/keyboards/handwired/fruity60/keyboard.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "fruity60",
+    "manufacturer": "yanfali",
+    "url": "https://github.com/yanfali/fruity60",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xB170",
+        "device_version": "0.0.1"
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "B7", "D6", "C7"],
+        "rows": ["B6", "B5", "D7", "C6", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "bluetooth": true
+    },
+    "community_layouts": ["60_tsangan_hhkb"],
+    "layouts": {
+        "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": [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": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "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.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": [5, 7], "x": 11.75, "y": 2},
+                {"matrix": [5, 8], "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": [5, 9], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [5, 10], "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, 8], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 12.5, "y": 4},
+                {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk
index 79e2ef4eff9..3437a35bdf1 100644
--- a/keyboards/handwired/fruity60/rules.mk
+++ b/keyboards/handwired/fruity60/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 = 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
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json
deleted file mode 100644
index 899bd58bcbf..00000000000
--- a/keyboards/handwired/hacked_motospeed/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "keyboard_name": "Hacked Motospeed",
-  "manufacturer": "MMO_Corp",
-  "url": "",
-  "maintainer": "Deckweiss",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x0690",
-    "device_version": "0.0.1"
-  },
-  "bluetooth": {
-    "driver": "rn42"
-  },
-  "matrix_pins": {
-    "cols": ["F7", "F6", "F5", "F4", "F3", "F2", "E0", "E1", "C0", "C1", "C2", "C3"],
-    "rows": ["B3", "B4", "F1", "B5", "B6", "D5", "D4", "D6", "D7", "C4"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B7"
-  },
-  "processor": "at90usb1286",
-  "bootloader": "halfkay",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0, "h": 2},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [1, 5], "x": 5, "y": 0},
-
-        {"matrix": [6, 6], "x": 7, "y": 0},
-        {"matrix": [5, 8], "x": 8, "y": 0},
-        {"matrix": [5, 7], "x": 9, "y": 0},
-        {"matrix": [5, 9], "x": 10, "y": 0},
-        {"matrix": [5, 10], "x": 11, "y": 0, "w": 2},
-
-        {"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, 5], "x": 5, "y": 1},
-
-        {"matrix": [9, 10], "x": 7, "y": 1},
-        {"matrix": [6, 7], "x": 8, "y": 1},
-        {"matrix": [6, 8], "x": 9, "y": 1},
-        {"matrix": [6, 9], "x": 10, "y": 1},
-        {"matrix": [6, 10], "x": 11, "y": 1},
-        {"matrix": [5, 11], "x": 12, "y": 1},
-
-        {"matrix": [3, 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": [4, 1], "x": 5, "y": 2},
-
-        {"matrix": [5, 6], "x": 7, "y": 2},
-        {"matrix": [7, 7], "x": 8, "y": 2},
-        {"matrix": [7, 8], "x": 9, "y": 2},
-        {"matrix": [7, 9], "x": 10, "y": 2},
-        {"matrix": [7, 10], "x": 11, "y": 2},
-
-        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 4], "x": 3, "y": 3},
-        {"matrix": [3, 3], "x": 4, "y": 3},
-        {"matrix": [2, 5], "x": 5, "y": 3},
-
-        {"matrix": [7, 6], "x": 7, "y": 3},
-        {"matrix": [8, 7], "x": 8, "y": 3},
-        {"matrix": [8, 8], "x": 9, "y": 3},
-        {"matrix": [8, 9], "x": 10, "y": 3},
-        {"matrix": [8, 10], "x": 11, "y": 3},
-        {"matrix": [8, 11], "x": 12, "y": 2, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/hacked_motospeed/keyboard.json b/keyboards/handwired/hacked_motospeed/keyboard.json
new file mode 100644
index 00000000000..af76a4dd769
--- /dev/null
+++ b/keyboards/handwired/hacked_motospeed/keyboard.json
@@ -0,0 +1,91 @@
+{
+  "keyboard_name": "Hacked Motospeed",
+  "manufacturer": "MMO_Corp",
+  "url": "",
+  "maintainer": "Deckweiss",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0690",
+    "device_version": "0.0.1",
+    "no_startup_check": true
+  },
+  "bluetooth": {
+    "driver": "rn42"
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "F4", "F3", "F2", "E0", "E1", "C0", "C1", "C2", "C3"],
+    "rows": ["B3", "B4", "F1", "B5", "B6", "D5", "D4", "D6", "D7", "C4"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "pin": "B7"
+  },
+  "processor": "at90usb1286",
+  "bootloader": "halfkay",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "backlight": true,
+    "bluetooth": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0, "h": 2},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [1, 5], "x": 5, "y": 0},
+
+        {"matrix": [6, 6], "x": 7, "y": 0},
+        {"matrix": [5, 8], "x": 8, "y": 0},
+        {"matrix": [5, 7], "x": 9, "y": 0},
+        {"matrix": [5, 9], "x": 10, "y": 0},
+        {"matrix": [5, 10], "x": 11, "y": 0, "w": 2},
+
+        {"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, 5], "x": 5, "y": 1},
+
+        {"matrix": [9, 10], "x": 7, "y": 1},
+        {"matrix": [6, 7], "x": 8, "y": 1},
+        {"matrix": [6, 8], "x": 9, "y": 1},
+        {"matrix": [6, 9], "x": 10, "y": 1},
+        {"matrix": [6, 10], "x": 11, "y": 1},
+        {"matrix": [5, 11], "x": 12, "y": 1},
+
+        {"matrix": [3, 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": [4, 1], "x": 5, "y": 2},
+
+        {"matrix": [5, 6], "x": 7, "y": 2},
+        {"matrix": [7, 7], "x": 8, "y": 2},
+        {"matrix": [7, 8], "x": 9, "y": 2},
+        {"matrix": [7, 9], "x": 10, "y": 2},
+        {"matrix": [7, 10], "x": 11, "y": 2},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 4], "x": 3, "y": 3},
+        {"matrix": [3, 3], "x": 4, "y": 3},
+        {"matrix": [2, 5], "x": 5, "y": 3},
+
+        {"matrix": [7, 6], "x": 7, "y": 3},
+        {"matrix": [8, 7], "x": 8, "y": 3},
+        {"matrix": [8, 8], "x": 9, "y": 3},
+        {"matrix": [8, 9], "x": 10, "y": 3},
+        {"matrix": [8, 10], "x": 11, "y": 3},
+        {"matrix": [8, 11], "x": 12, "y": 2, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/hacked_motospeed/rules.mk b/keyboards/handwired/hacked_motospeed/rules.mk
deleted file mode 100644
index 362a7fadbed..00000000000
--- a/keyboards/handwired/hacked_motospeed/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 = 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
-NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/jankrp2040dactyl/info.json b/keyboards/handwired/jankrp2040dactyl/keyboard.json
similarity index 100%
rename from keyboards/handwired/jankrp2040dactyl/info.json
rename to keyboards/handwired/jankrp2040dactyl/keyboard.json
diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json
deleted file mode 100644
index 502b41ebce0..00000000000
--- a/keyboards/handwired/jtallbean/split_65/info.json
+++ /dev/null
@@ -1,217 +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": {
-        "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/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 fce764c22d4..00000000000
--- a/keyboards/handwired/jtallbean/split_65/rules.mk
+++ /dev/null
@@ -1,12 +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
diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/info.json
deleted file mode 100644
index 095f53b7c6c..00000000000
--- a/keyboards/handwired/ks63/info.json
+++ /dev/null
@@ -1,95 +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": {
-        "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/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 3f2eac5940c..00000000000
--- a/keyboards/handwired/ks63/rules.mk
+++ /dev/null
@@ -1,12 +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
diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json
deleted file mode 100644
index 0c968c419d8..00000000000
--- a/keyboards/handwired/lagrange/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-    "keyboard_name": "Lagrange",
-    "manufacturer": "Dimitris Papavasiliou",
-    "url": "https://github.com/dpapavas/lagrange-keyboard",
-    "maintainer": "dpapavas",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x2718",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "B5", "D7", "B6", "C6", "D6"],
-        "rows": ["E6", "F1", "F0", "F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "matrix_pins": {
-            "right": {
-                "cols": ["C7", "F7", "F6", "F5", "F4", "F1"],
-                "rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"]
-            }
-        }
-    },
-    "indicators": {
-        "caps_lock": "D1",
-        "scroll_lock": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.75, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.75},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.375},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.5},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.5},
-
-                {"matrix": [7, 5], "x": 12.5, "y": 0.5},
-                {"matrix": [7, 4], "x": 13.5, "y": 0.5},
-                {"matrix": [7, 3], "x": 14.5, "y": 0},
-                {"matrix": [7, 2], "x": 15.5, "y": 0.375},
-                {"matrix": [7, 1], "x": 16.5, "y": 0.75},
-                {"matrix": [7, 0], "x": 17.5, "y": 0.75, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.75, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.75},
-                {"matrix": [1, 2], "x": 2.5, "y": 1.375},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
-
-                {"matrix": [8, 5], "x": 12.5, "y": 1.5},
-                {"matrix": [8, 4], "x": 13.5, "y": 1.5},
-                {"matrix": [8, 3], "x": 14.5, "y": 1},
-                {"matrix": [8, 2], "x": 15.5, "y": 1.375},
-                {"matrix": [8, 1], "x": 16.5, "y": 1.75},
-                {"matrix": [8, 0], "x": 17.5, "y": 1.75, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.75, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.75},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.375},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-
-                {"matrix": [9, 5], "x": 12.5, "y": 2.5},
-                {"matrix": [9, 4], "x": 13.5, "y": 2.5},
-                {"matrix": [9, 3], "x": 14.5, "y": 2},
-                {"matrix": [9, 2], "x": 15.5, "y": 2.375},
-                {"matrix": [9, 1], "x": 16.5, "y": 2.75},
-                {"matrix": [9, 0], "x": 17.5, "y": 2.75, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.75},
-                {"matrix": [3, 2], "x": 2.5, "y": 3.375},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.5, "y": 3.5},
-
-                {"matrix": [10, 5], "x": 12.5, "y": 3.5},
-                {"matrix": [10, 4], "x": 13.5, "y": 3.5},
-                {"matrix": [10, 3], "x": 14.5, "y": 3},
-                {"matrix": [10, 2], "x": 15.5, "y": 3.375},
-                {"matrix": [10, 1], "x": 16.5, "y": 3.75},
-                {"matrix": [10, 0], "x": 17.5, "y": 3.75, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.375},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 5, "h": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 5, "h": 1.5},
-                {"matrix": [5, 5], "x": 7, "y": 5, "h": 1.5},
-                {"matrix": [6, 5], "x": 8, "y": 5.5},
-
-                {"matrix": [13, 5], "x": 10, "y": 5.5},
-                {"matrix": [12, 5], "x": 11, "y": 5, "h": 1.5},
-                {"matrix": [11, 5], "x": 12, "y": 5, "h": 1.5},
-                {"matrix": [11, 4], "x": 13, "y": 5, "h": 1.25},
-                {"matrix": [11, 3], "x": 14.5, "y": 4},
-                {"matrix": [11, 2], "x": 15.5, "y": 4.5},
-                {"matrix": [11, 0], "x": 17.5, "y": 4.75, "w": 1.5},
-
-                {"matrix": [5, 3], "x": 5, "y": 7},
-                {"matrix": [5, 4], "x": 6, "y": 6.5},
-                {"matrix": [6, 4], "x": 7, "y": 7},
-
-                {"matrix": [13, 4], "x": 11, "y": 7},
-                {"matrix": [12, 4], "x": 12, "y": 6.5},
-                {"matrix": [12, 3], "x": 13, "y": 7},
-
-                {"matrix": [6, 3], "x": 6, "y": 7.5},
-
-                {"matrix": [13, 3], "x": 12, "y": 7.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/lagrange/keyboard.json b/keyboards/handwired/lagrange/keyboard.json
new file mode 100644
index 00000000000..d7ad47355ab
--- /dev/null
+++ b/keyboards/handwired/lagrange/keyboard.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "Lagrange",
+    "manufacturer": "Dimitris Papavasiliou",
+    "url": "https://github.com/dpapavas/lagrange-keyboard",
+    "maintainer": "dpapavas",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x2718",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "D7", "B6", "C6", "D6"],
+        "rows": ["E6", "F1", "F0", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["C7", "F7", "F6", "F5", "F4", "F1"],
+                "rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"]
+            }
+        },
+        "transport": {
+            "protocol": "custom"
+        }
+    },
+    "indicators": {
+        "caps_lock": "D1",
+        "scroll_lock": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "unicode": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.75, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.75},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.375},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.5},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.5},
+
+                {"matrix": [7, 5], "x": 12.5, "y": 0.5},
+                {"matrix": [7, 4], "x": 13.5, "y": 0.5},
+                {"matrix": [7, 3], "x": 14.5, "y": 0},
+                {"matrix": [7, 2], "x": 15.5, "y": 0.375},
+                {"matrix": [7, 1], "x": 16.5, "y": 0.75},
+                {"matrix": [7, 0], "x": 17.5, "y": 0.75, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.75},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.375},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+
+                {"matrix": [8, 5], "x": 12.5, "y": 1.5},
+                {"matrix": [8, 4], "x": 13.5, "y": 1.5},
+                {"matrix": [8, 3], "x": 14.5, "y": 1},
+                {"matrix": [8, 2], "x": 15.5, "y": 1.375},
+                {"matrix": [8, 1], "x": 16.5, "y": 1.75},
+                {"matrix": [8, 0], "x": 17.5, "y": 1.75, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.75},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.375},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+
+                {"matrix": [9, 5], "x": 12.5, "y": 2.5},
+                {"matrix": [9, 4], "x": 13.5, "y": 2.5},
+                {"matrix": [9, 3], "x": 14.5, "y": 2},
+                {"matrix": [9, 2], "x": 15.5, "y": 2.375},
+                {"matrix": [9, 1], "x": 16.5, "y": 2.75},
+                {"matrix": [9, 0], "x": 17.5, "y": 2.75, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.75},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.375},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+
+                {"matrix": [10, 5], "x": 12.5, "y": 3.5},
+                {"matrix": [10, 4], "x": 13.5, "y": 3.5},
+                {"matrix": [10, 3], "x": 14.5, "y": 3},
+                {"matrix": [10, 2], "x": 15.5, "y": 3.375},
+                {"matrix": [10, 1], "x": 16.5, "y": 3.75},
+                {"matrix": [10, 0], "x": 17.5, "y": 3.75, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.375},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 5, "h": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5, "h": 1.5},
+                {"matrix": [5, 5], "x": 7, "y": 5, "h": 1.5},
+                {"matrix": [6, 5], "x": 8, "y": 5.5},
+
+                {"matrix": [13, 5], "x": 10, "y": 5.5},
+                {"matrix": [12, 5], "x": 11, "y": 5, "h": 1.5},
+                {"matrix": [11, 5], "x": 12, "y": 5, "h": 1.5},
+                {"matrix": [11, 4], "x": 13, "y": 5, "h": 1.25},
+                {"matrix": [11, 3], "x": 14.5, "y": 4},
+                {"matrix": [11, 2], "x": 15.5, "y": 4.5},
+                {"matrix": [11, 0], "x": 17.5, "y": 4.75, "w": 1.5},
+
+                {"matrix": [5, 3], "x": 5, "y": 7},
+                {"matrix": [5, 4], "x": 6, "y": 6.5},
+                {"matrix": [6, 4], "x": 7, "y": 7},
+
+                {"matrix": [13, 4], "x": 11, "y": 7},
+                {"matrix": [12, 4], "x": 12, "y": 6.5},
+                {"matrix": [12, 3], "x": 13, "y": 7},
+
+                {"matrix": [6, 3], "x": 6, "y": 7.5},
+
+                {"matrix": [13, 3], "x": 12, "y": 7.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/lagrange/rules.mk b/keyboards/handwired/lagrange/rules.mk
index 256826f7fcc..1f2175e9cbf 100644
--- a/keyboards/handwired/lagrange/rules.mk
+++ b/keyboards/handwired/lagrange/rules.mk
@@ -1,17 +1,2 @@
-# 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
-UNICODE_ENABLE = yes
-SPLIT_TRANSPORT = custom
-
 SRC += transport.c
 SPI_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json
deleted file mode 100644
index 41342fc2ec6..00000000000
--- a/keyboards/handwired/m40/5x5_macropad/info.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "keyboard_name": "5x5_macropad",
-    "manufacturer": "m40",
-    "url": "https://www.thingiverse.com/thing:5239739",
-    "maintainer": "m40-dev",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F7"],
-        "rows": ["B5", "B4", "E6", "D7", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/m40/5x5_macropad/keyboard.json b/keyboards/handwired/m40/5x5_macropad/keyboard.json
new file mode 100644
index 00000000000..b4bc53afc54
--- /dev/null
+++ b/keyboards/handwired/m40/5x5_macropad/keyboard.json
@@ -0,0 +1,59 @@
+{
+    "keyboard_name": "5x5_macropad",
+    "manufacturer": "m40",
+    "url": "https://www.thingiverse.com/thing:5239739",
+    "maintainer": "m40-dev",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7"],
+        "rows": ["B5", "B4", "E6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true
+    },
+    "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/m40/5x5_macropad/rules.mk b/keyboards/handwired/m40/5x5_macropad/rules.mk
index fe66abc8493..4df55cd2206 100644
--- a/keyboards/handwired/m40/5x5_macropad/rules.mk
+++ b/keyboards/handwired/m40/5x5_macropad/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 = 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
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
\ No newline at end of file
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/info.json
deleted file mode 100644
index 5108d8ce50b..00000000000
--- a/keyboards/handwired/macroboard/f401/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
-        "rows": ["A4", "A3", "A2", "A1", "A0"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "driver": "pwm"
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/macroboard/f401/keyboard.json b/keyboards/handwired/macroboard/f401/keyboard.json
new file mode 100644
index 00000000000..43aa322a2a8
--- /dev/null
+++ b/keyboards/handwired/macroboard/f401/keyboard.json
@@ -0,0 +1,25 @@
+{
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "driver": "pwm"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "board": "BLACKPILL_STM32_F401"
+}
diff --git a/keyboards/handwired/macroboard/f401/rules.mk b/keyboards/handwired/macroboard/f401/rules.mk
deleted file mode 100644
index bc0cd6b97f6..00000000000
--- a/keyboards/handwired/macroboard/f401/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
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json
deleted file mode 100644
index d7ff61f52b6..00000000000
--- a/keyboards/handwired/macroboard/f411/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B12", "B13", "B14", "B15", "A8", "A10"],
-        "rows": ["A15", "B3", "B4", "B5", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "driver": "pwm"
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/handwired/macroboard/f411/keyboard.json b/keyboards/handwired/macroboard/f411/keyboard.json
new file mode 100644
index 00000000000..0f6d7077a3c
--- /dev/null
+++ b/keyboards/handwired/macroboard/f411/keyboard.json
@@ -0,0 +1,26 @@
+{
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A10"],
+        "rows": ["A15", "B3", "B4", "B5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "driver": "pwm"
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "audio": true
+    },
+    "board": "BLACKPILL_STM32_F411"
+}
diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk
index cdf33bfea5b..72f75f4367e 100644
--- a/keyboards/handwired/macroboard/f411/rules.mk
+++ b/keyboards/handwired/macroboard/f411/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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes           # Audio output
 AUDIO_DRIVER = pwm_hardware
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json
deleted file mode 100644
index eeaa9c392be..00000000000
--- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
-        "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C13",
-        "on_state": 0
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json
new file mode 100644
index 00000000000..4a9e2a5380a
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json
@@ -0,0 +1,145 @@
+{
+    "keyboard_name": "Meck TKL",
+    "manufacturer": "gabrielkim13",
+    "url": "github.com/gabrielkim13",
+    "maintainer": "gabrielkim13",
+    "usb": {
+        "vid": "0x474B",
+        "pid": "0x0001",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
+        "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F401",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 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/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
deleted file mode 100644
index b5f27c93eab..00000000000
--- a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h
deleted file mode 100644
index 30221cc2168..00000000000
--- a/keyboards/handwired/meck_tkl/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Gabriel Kim (@gabrielkim13)
-// 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/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/info.json
deleted file mode 100644
index 8266e704bc6..00000000000
--- a/keyboards/handwired/meck_tkl/info.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "keyboard_name": "Meck TKL",
-    "manufacturer": "gabrielkim13",
-    "url": "github.com/gabrielkim13",
-    "maintainer": "gabrielkim13",
-    "usb": {
-        "vid": "0x474B",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 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/handwired/meck_tkl/rules.mk b/keyboards/handwired/meck_tkl/rules.mk
index 6213285117b..cdf3900ff0d 100644
--- a/keyboards/handwired/meck_tkl/rules.mk
+++ b/keyboards/handwired/meck_tkl/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 = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
 
diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
deleted file mode 100644
index cd5de808f4d..00000000000
--- a/keyboards/handwired/myskeeb/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "keyboard_name": "MySKeeb",
-    "manufacturer": "DAG3",
-    "url": "",
-    "maintainer": "su8044",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"],
-        "rows": ["C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D3",
-        "matrix_pins": {
-            "right": {
-                "cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "debounce": 0,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 1, "w": 1.5, "matrix": [0, 0]},
-                {"x": 1.5, "y": 0.75, "matrix": [0, 1]},
-                {"x": 2.5, "y": 0.25, "matrix": [0, 2]},
-                {"x": 3.5, "y": 0, "matrix": [0, 3]},
-                {"x": 4.5, "y": 0.25, "matrix": [0, 4]},
-                {"x": 5.5, "y": 0.75, "matrix": [0, 5]},
-                {"x": 6.5, "y": 1, "matrix": [0, 6]},
-
-                {"x": 9.5, "y": 1, "matrix": [5, 0]},
-                {"x": 10.5, "y": 0.75, "matrix": [5, 1]},
-                {"x": 11.5, "y": 0.25, "matrix": [5, 2]},
-                {"x": 12.5, "y": 0, "matrix": [5, 3]},
-                {"x": 13.5, "y": 0.25, "matrix": [5, 4]},
-                {"x": 14.5, "y": 0.75, "matrix": [5, 5]},
-                {"x": 15.5, "y": 1, "w": 1.5, "matrix": [5, 6]},
-
-                {"x": 0, "y": 2, "w": 1.5, "matrix": [1, 0]},
-                {"x": 1.5, "y": 1.75, "matrix": [1, 1]},
-                {"x": 2.5, "y": 1.25, "matrix": [1, 2]},
-                {"x": 3.5, "y": 1, "matrix": [1, 3]},
-                {"x": 4.5, "y": 1.25, "matrix": [1, 4]},
-                {"x": 5.5, "y": 1.75, "matrix": [1, 5]},
-                {"x": 6.5, "y": 2, "h": 1.5, "matrix": [1, 6]},
-
-                {"x": 9.5, "y": 2, "h": 1.5, "matrix": [6, 0]},
-                {"x": 10.5, "y": 1.75, "matrix": [6, 1]},
-                {"x": 11.5, "y": 1.25, "matrix": [6, 2]},
-                {"x": 12.5, "y": 1, "matrix": [6, 3]},
-                {"x": 13.5, "y": 1.25, "matrix": [6, 4]},
-                {"x": 14.5, "y": 1.75, "matrix": [6, 5]},
-                {"x": 15.5, "y": 2, "w": 1.5, "matrix": [6, 6]},
-
-                {"x": 0, "y": 3, "w": 1.5, "matrix": [2, 0]},
-                {"x": 1.5, "y": 2.75, "matrix": [2, 1]},
-                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
-                {"x": 3.5, "y": 2, "matrix": [2, 3]},
-                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
-                {"x": 5.5, "y": 2.75, "matrix": [2, 5]},
-
-                {"x": 10.5, "y": 2.75, "matrix": [7, 1]},
-                {"x": 11.5, "y": 2.25, "matrix": [7, 2]},
-                {"x": 12.5, "y": 2, "matrix": [7, 3]},
-                {"x": 13.5, "y": 2.25, "matrix": [7, 4]},
-                {"x": 14.5, "y": 2.75, "matrix": [7, 5]},
-                {"x": 15.5, "y": 3, "w": 1.5, "matrix": [7, 6]},
-
-                {"x": 0, "y": 4, "w": 1.5, "matrix": [3, 0]},
-                {"x": 1.5, "y": 3.75, "matrix": [3, 1]},
-                {"x": 2.5, "y": 3.25, "matrix": [3, 2]},
-                {"x": 3.5, "y": 3, "matrix": [3, 3]},
-                {"x": 4.5, "y": 3.25, "matrix": [3, 4]},
-                {"x": 5.5, "y": 3.75, "matrix": [3, 5]},
-                {"x": 6.5, "y": 3.5, "h": 1.5, "matrix": [3, 6]},
-
-                {"x": 9.5, "y": 3.5, "h": 1.5, "matrix": [8, 0]},
-                {"x": 10.5, "y": 3.75, "matrix": [8, 1]},
-                {"x": 11.5, "y": 3.25, "matrix": [8, 2]},
-                {"x": 12.5, "y": 3, "matrix": [8, 3]},
-                {"x": 13.5, "y": 3.25, "matrix": [8, 4]},
-                {"x": 14.5, "y": 3.75, "matrix": [8, 5]},
-                {"x": 15.5, "y": 4, "w": 1.5, "matrix": [8, 6]},
-
-                {"x": 0.25, "y": 5, "matrix": [4, 0]},
-                {"x": 1.5, "y": 4.75, "matrix": [4, 1]},
-                {"x": 2.5, "y": 4.25, "matrix": [4, 2]},
-                {"x": 3.5, "y": 4, "matrix": [4, 3]},
-
-                {"x": 5, "y": 6, "matrix": [4, 4]},
-                {"x": 6, "y": 5.5, "h": 2, "matrix": [4, 5]},
-                {"x": 7, "y": 5.5, "h": 2, "matrix": [4, 6]},
-
-                {"x": 9, "y": 5.5, "h": 2, "matrix": [9, 0]},
-                {"x": 10, "y": 5.5, "h": 2, "matrix": [9, 1]},
-                {"x": 11, "y": 6, "matrix": [9, 2]},
-
-                {"x": 12.5, "y": 4, "matrix": [9, 3]},
-                {"x": 13.5, "y": 4.25, "matrix": [9, 4]},
-                {"x": 14.5, "y": 4.75, "matrix": [9, 5]},
-                {"x": 15.75, "y": 5, "matrix": [9, 6]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/myskeeb/keyboard.json b/keyboards/handwired/myskeeb/keyboard.json
new file mode 100644
index 00000000000..f2da286f194
--- /dev/null
+++ b/keyboards/handwired/myskeeb/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "MySKeeb",
+    "manufacturer": "DAG3",
+    "url": "",
+    "maintainer": "su8044",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "1.0.0",
+        "no_startup_check": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "oled": true
+    },
+    "debounce": 0,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [0, 0]},
+                {"x": 1.5, "y": 0.75, "matrix": [0, 1]},
+                {"x": 2.5, "y": 0.25, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0.25, "matrix": [0, 4]},
+                {"x": 5.5, "y": 0.75, "matrix": [0, 5]},
+                {"x": 6.5, "y": 1, "matrix": [0, 6]},
+
+                {"x": 9.5, "y": 1, "matrix": [5, 0]},
+                {"x": 10.5, "y": 0.75, "matrix": [5, 1]},
+                {"x": 11.5, "y": 0.25, "matrix": [5, 2]},
+                {"x": 12.5, "y": 0, "matrix": [5, 3]},
+                {"x": 13.5, "y": 0.25, "matrix": [5, 4]},
+                {"x": 14.5, "y": 0.75, "matrix": [5, 5]},
+                {"x": 15.5, "y": 1, "w": 1.5, "matrix": [5, 6]},
+
+                {"x": 0, "y": 2, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1.75, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1.25, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1.25, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1.75, "matrix": [1, 5]},
+                {"x": 6.5, "y": 2, "h": 1.5, "matrix": [1, 6]},
+
+                {"x": 9.5, "y": 2, "h": 1.5, "matrix": [6, 0]},
+                {"x": 10.5, "y": 1.75, "matrix": [6, 1]},
+                {"x": 11.5, "y": 1.25, "matrix": [6, 2]},
+                {"x": 12.5, "y": 1, "matrix": [6, 3]},
+                {"x": 13.5, "y": 1.25, "matrix": [6, 4]},
+                {"x": 14.5, "y": 1.75, "matrix": [6, 5]},
+                {"x": 15.5, "y": 2, "w": 1.5, "matrix": [6, 6]},
+
+                {"x": 0, "y": 3, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.75, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2.75, "matrix": [2, 5]},
+
+                {"x": 10.5, "y": 2.75, "matrix": [7, 1]},
+                {"x": 11.5, "y": 2.25, "matrix": [7, 2]},
+                {"x": 12.5, "y": 2, "matrix": [7, 3]},
+                {"x": 13.5, "y": 2.25, "matrix": [7, 4]},
+                {"x": 14.5, "y": 2.75, "matrix": [7, 5]},
+                {"x": 15.5, "y": 3, "w": 1.5, "matrix": [7, 6]},
+
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [3, 0]},
+                {"x": 1.5, "y": 3.75, "matrix": [3, 1]},
+                {"x": 2.5, "y": 3.25, "matrix": [3, 2]},
+                {"x": 3.5, "y": 3, "matrix": [3, 3]},
+                {"x": 4.5, "y": 3.25, "matrix": [3, 4]},
+                {"x": 5.5, "y": 3.75, "matrix": [3, 5]},
+                {"x": 6.5, "y": 3.5, "h": 1.5, "matrix": [3, 6]},
+
+                {"x": 9.5, "y": 3.5, "h": 1.5, "matrix": [8, 0]},
+                {"x": 10.5, "y": 3.75, "matrix": [8, 1]},
+                {"x": 11.5, "y": 3.25, "matrix": [8, 2]},
+                {"x": 12.5, "y": 3, "matrix": [8, 3]},
+                {"x": 13.5, "y": 3.25, "matrix": [8, 4]},
+                {"x": 14.5, "y": 3.75, "matrix": [8, 5]},
+                {"x": 15.5, "y": 4, "w": 1.5, "matrix": [8, 6]},
+
+                {"x": 0.25, "y": 5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4.75, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4.25, "matrix": [4, 2]},
+                {"x": 3.5, "y": 4, "matrix": [4, 3]},
+
+                {"x": 5, "y": 6, "matrix": [4, 4]},
+                {"x": 6, "y": 5.5, "h": 2, "matrix": [4, 5]},
+                {"x": 7, "y": 5.5, "h": 2, "matrix": [4, 6]},
+
+                {"x": 9, "y": 5.5, "h": 2, "matrix": [9, 0]},
+                {"x": 10, "y": 5.5, "h": 2, "matrix": [9, 1]},
+                {"x": 11, "y": 6, "matrix": [9, 2]},
+
+                {"x": 12.5, "y": 4, "matrix": [9, 3]},
+                {"x": 13.5, "y": 4.25, "matrix": [9, 4]},
+                {"x": 14.5, "y": 4.75, "matrix": [9, 5]},
+                {"x": 15.75, "y": 5, "matrix": [9, 6]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk
deleted file mode 100644
index 21c4a23eb3b..00000000000
--- a/keyboards/handwired/myskeeb/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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-AUDIO_ENABLE = no           # Audio output
-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 e14bf01acb5..00000000000
--- a/keyboards/handwired/not_so_minidox/info.json
+++ /dev/null
@@ -1,77 +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": {
-    "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/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 ab2c49da70e..00000000000
--- a/keyboards/handwired/not_so_minidox/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 = 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/handwired/novem/info.json b/keyboards/handwired/novem/info.json
deleted file mode 100644
index bc70d64ed44..00000000000
--- a/keyboards/handwired/novem/info.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "keyboard_name": "novem",
-    "manufacturer": "Jose I. Martinez",
-    "url": "",
-    "maintainer": "Jose I. Martinez",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B3", "B2", "B6"],
-        "rows": ["E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/novem/keyboard.json b/keyboards/handwired/novem/keyboard.json
new file mode 100644
index 00000000000..bc4fe2c1c95
--- /dev/null
+++ b/keyboards/handwired/novem/keyboard.json
@@ -0,0 +1,40 @@
+{
+    "keyboard_name": "novem",
+    "manufacturer": "Jose I. Martinez",
+    "url": "",
+    "maintainer": "Jose I. Martinez",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B6"],
+        "rows": ["E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": 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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/novem/rules.mk b/keyboards/handwired/novem/rules.mk
deleted file mode 100644
index ca9d24172d0..00000000000
--- a/keyboards/handwired/novem/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/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/info.json
deleted file mode 100644
index 69a7ea87a75..00000000000
--- a/keyboards/handwired/onekey/blackpill_f401/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "keyboard_name": "Onekey Blackpill STM32F401",
-    "development_board": "blackpill_f401",
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["A7"]
-    },
-    "backlight": {
-        "pin": "A0"
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "apa102": {
-        "data_pin": "A1",
-        "clock_pin": "A2"
-    }
-}
diff --git a/keyboards/handwired/onekey/blackpill_f401/keyboard.json b/keyboards/handwired/onekey/blackpill_f401/keyboard.json
new file mode 100644
index 00000000000..29e2f3f17d6
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f401/keyboard.json
@@ -0,0 +1,23 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F401",
+    "development_board": "blackpill_f401",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
+    }
+}
diff --git a/keyboards/handwired/onekey/blackpill_f401/rules.mk b/keyboards/handwired/onekey/blackpill_f401/rules.mk
deleted file mode 100644
index 1071cf62ee3..00000000000
--- a/keyboards/handwired/onekey/blackpill_f401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
deleted file mode 100644
index ed9435c740b..00000000000
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2",
-    "development_board": "blackpill_f401",
-    "bootloader": "tinyuf2",
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["A7"]
-    },
-    "backlight": {
-        "pin": "A0"
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "apa102": {
-        "data_pin": "A1",
-        "clock_pin": "A2"
-    }
-}
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json
new file mode 100644
index 00000000000..413bf7a7f34
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2",
+    "development_board": "blackpill_f401",
+    "bootloader": "tinyuf2",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
+    }
+}
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk
deleted file mode 100755
index 1071cf62ee3..00000000000
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/info.json
deleted file mode 100644
index 5ee8ec3d5ed..00000000000
--- a/keyboards/handwired/onekey/blackpill_f411/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "keyboard_name": "Onekey Blackpill STM32F411",
-    "development_board": "blackpill_f411",
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["A7"]
-    },
-    "backlight": {
-        "pin": "A0"
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "apa102": {
-        "data_pin": "A1",
-        "clock_pin": "A2"
-    }
-}
diff --git a/keyboards/handwired/onekey/blackpill_f411/keyboard.json b/keyboards/handwired/onekey/blackpill_f411/keyboard.json
new file mode 100644
index 00000000000..077fee4b3bd
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f411/keyboard.json
@@ -0,0 +1,23 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F411",
+    "development_board": "blackpill_f411",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
+    }
+}
diff --git a/keyboards/handwired/onekey/blackpill_f411/rules.mk b/keyboards/handwired/onekey/blackpill_f411/rules.mk
deleted file mode 100644
index 1071cf62ee3..00000000000
--- a/keyboards/handwired/onekey/blackpill_f411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
deleted file mode 100644
index 8e8b52080ad..00000000000
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2",
-    "development_board": "blackpill_f411",
-    "bootloader": "tinyuf2",
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["A7"]
-    },
-    "backlight": {
-        "pin": "A0"
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "apa102": {
-        "data_pin": "A1",
-        "clock_pin": "A2"
-    }
-}
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json
new file mode 100644
index 00000000000..e37bf6f54dc
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2",
+    "development_board": "blackpill_f411",
+    "bootloader": "tinyuf2",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
+    }
+}
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
deleted file mode 100755
index 1071cf62ee3..00000000000
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json
deleted file mode 100644
index 9460b43f5f4..00000000000
--- a/keyboards/handwired/onekey/bluepill_f103c6/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "keyboard_name": "Onekey Bluepill STM32F103C6",
-    "processor": "STM32F103",
-    "board": "STM32_F103_STM32DUINO",
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["A7"]
-    },
-    "backlight": {
-        "pin": "A0"
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "apa102": {
-        "data_pin": "A1",
-        "clock_pin": "A2"
-    }
-}
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json
new file mode 100644
index 00000000000..4267222cfc9
--- /dev/null
+++ b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json
@@ -0,0 +1,22 @@
+{
+    "keyboard_name": "Onekey Bluepill STM32F103C6",
+    "processor": "STM32F103",
+    "board": "STM32_F103_STM32DUINO",
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
+    },
+    "build": {
+        "lto": true
+    }
+}
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
index 71bc488563a..c37cc1dc1fa 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
+++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
@@ -7,9 +7,6 @@ BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
 
-# LTO is required to fit the firmware into the available 24K of flash
-LTO_ENABLE = yes
-
 # EEPROM emulation not supported yet (need to implement a proper firmware size
 # check first, otherwise the chance of the EEPROM backing store overwriting
 # some part of the firmware code is really high).
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/evb_wb32f3g71/info.json
rename to keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/evb_wb32fq95/info.json
rename to keyboards/handwired/onekey/evb_wb32fq95/keyboard.json
diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/info.json
deleted file mode 100644
index 5c0c92ef5de..00000000000
--- a/keyboards/handwired/onekey/kb2040/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "keyboard_name": "Onekey KB2040",
-    "development_board": "kb2040",
-    "matrix_pins": {
-        "cols": ["GP4"],
-        "rows": ["GP5"]
-    },
-    "ws2812": {
-        "pin": "GP17",
-        "driver": "vendor"
-    }
-}
diff --git a/keyboards/handwired/onekey/kb2040/keyboard.json b/keyboards/handwired/onekey/kb2040/keyboard.json
new file mode 100644
index 00000000000..3c099342271
--- /dev/null
+++ b/keyboards/handwired/onekey/kb2040/keyboard.json
@@ -0,0 +1,15 @@
+{
+    "keyboard_name": "Onekey KB2040",
+    "development_board": "kb2040",
+    "matrix_pins": {
+        "cols": ["GP4"],
+        "rows": ["GP5"]
+    },
+    "ws2812": {
+        "pin": "GP17",
+        "driver": "vendor"
+    },
+    "features": {
+        "oled": true
+    }
+}
diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/handwired/onekey/kb2040/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/sipeed_longan_nano/info.json
rename to keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_lc/info.json b/keyboards/handwired/onekey/teensy_lc/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/teensy_lc/info.json
rename to keyboards/handwired/onekey/teensy_lc/keyboard.json
diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/info.json
deleted file mode 100644
index 14c87182563..00000000000
--- a/keyboards/handwired/orbweaver/info.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "manufacturer": "a_marmot",
-    "keyboard_name": "orbweaver",
-    "maintainer": "a_marmot",
-    "bootloader": "rp2040",
-    "diode_direction": "ROW2COL",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "rgb_matrix": {
-        "center_point": [40, 30],
-        "driver": "is31fl3731"
-    },
-    "matrix_pins": {
-        "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
-        "cols": ["GP12", "GP13", "GP14", "GP15", "GP16"]
-    },
-    "processor": "RP2040",
-    "url": "https://geekhack.org/index.php?topic=119396.0",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "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": [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},
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "w": 4, "x": 1, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/orbweaver/keyboard.json b/keyboards/handwired/orbweaver/keyboard.json
new file mode 100644
index 00000000000..5ba08dfc2d5
--- /dev/null
+++ b/keyboards/handwired/orbweaver/keyboard.json
@@ -0,0 +1,64 @@
+{
+    "manufacturer": "a_marmot",
+    "keyboard_name": "orbweaver",
+    "maintainer": "a_marmot",
+    "bootloader": "rp2040",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "center_point": [40, 30],
+        "driver": "is31fl3731"
+    },
+    "matrix_pins": {
+        "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
+        "cols": ["GP12", "GP13", "GP14", "GP15", "GP16"]
+    },
+    "processor": "RP2040",
+    "url": "https://geekhack.org/index.php?topic=119396.0",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "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": [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},
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "w": 4, "x": 1, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/orbweaver/rules.mk b/keyboards/handwired/orbweaver/rules.mk
deleted file mode 100644
index 01f9d9397ae..00000000000
--- a/keyboards/handwired/orbweaver/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add support for 3731 RGB matrix controller
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json
deleted file mode 100644
index b2280b62040..00000000000
--- a/keyboards/handwired/ortho_brass/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "keyboard_name": "Ortho Brass",
-    "manufacturer": "BifbofII",
-    "url": "",
-    "maintainer": "BifbofII",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F7", "F5", "F1", "C7", "F0", "B1", "B0", "F6", "B6", "B2", "B3"],
-        "rows": ["D3", "D2", "D1", "D0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "community_layouts": ["ortho_4x12"],
-    "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, "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_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/handwired/ortho_brass/keyboard.json b/keyboards/handwired/ortho_brass/keyboard.json
new file mode 100644
index 00000000000..5cd01b1f6d6
--- /dev/null
+++ b/keyboards/handwired/ortho_brass/keyboard.json
@@ -0,0 +1,139 @@
+{
+    "keyboard_name": "Ortho Brass",
+    "manufacturer": "BifbofII",
+    "url": "",
+    "maintainer": "BifbofII",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F1", "C7", "F0", "B1", "B0", "F6", "B6", "B2", "B3"],
+        "rows": ["D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
+    "community_layouts": ["ortho_4x12"],
+    "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, "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_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/handwired/ortho_brass/rules.mk b/keyboards/handwired/ortho_brass/rules.mk
index 36acc6fd924..6642cf3a9c4 100644
--- a/keyboards/handwired/ortho_brass/rules.mk
+++ b/keyboards/handwired/ortho_brass/rules.mk
@@ -1,11 +1 @@
-# 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
-RGBLIGHT_ENABLE = no        # Enable RGB underlight.
-
 RGBLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/osborne1/info.json b/keyboards/handwired/osborne1/info.json
deleted file mode 100644
index 2f613b5876d..00000000000
--- a/keyboards/handwired/osborne1/info.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-    "manufacturer": "crackmonkey",
-    "keyboard_name": "osborne1",
-    "maintainer": "crackmonkey",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": true,
-        "extrakey": false,
-        "mousekey": false,
-        "nkro": false
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D2", "F0", "F1", "F4", "F5", "F6", "F7"],
-        "rows": ["D0", "B7", "B5", "C6", "D1", "B6", "D7", "D6"]
-    },
-    "processor": "atmega32u4",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x239A",
-        "vid": "0x800C"
-    },
-    "layouts": {
-        "LAYOUT_64_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
-                {"matrix": [1, 0], "label": "1", "x": 1, "y": 0},
-                {"matrix": [1, 1], "label": "2", "x": 2, "y": 0},
-                {"matrix": [1, 2], "label": "3", "x": 3, "y": 0},
-                {"matrix": [1, 3], "label": "4", "x": 4, "y": 0},
-                {"matrix": [1, 4], "label": "5", "x": 5, "y": 0},
-                {"matrix": [1, 5], "label": "6", "x": 6, "y": 0},
-                {"matrix": [1, 6], "label": "7", "x": 7, "y": 0},
-                {"matrix": [1, 7], "label": "8", "x": 8, "y": 0},
-                {"matrix": [5, 7], "label": "9", "x": 9, "y": 0},
-                {"matrix": [5, 2], "label": "0", "x": 10, "y": 0},
-                {"matrix": [6, 2], "label": "-", "x": 11, "y": 0},
-                {"matrix": [6, 7], "label": "=", "x": 12, "y": 0},
-                {"matrix": [0, 7], "label": "[", "x": 13, "y": 0},
-                {"matrix": [5, 0], "label": "Up", "x": 14, "y": 0},
-                {"matrix": [0, 1], "label": "TAB", "x": 0, "y": 1},
-                {"matrix": [2, 0], "label": "Q", "x": 1, "y": 1},
-                {"matrix": [2, 1], "label": "W", "x": 2, "y": 1},
-                {"matrix": [2, 2], "label": "E", "x": 3, "y": 1},
-                {"matrix": [2, 3], "label": "R", "x": 4, "y": 1},
-                {"matrix": [2, 4], "label": "T", "x": 5, "y": 1},
-                {"matrix": [2, 5], "label": "Y", "x": 6, "y": 1},
-                {"matrix": [2, 6], "label": "U", "x": 7, "y": 1},
-                {"matrix": [2, 7], "label": "I", "x": 8, "y": 1},
-                {"matrix": [5, 6], "label": "O", "x": 9, "y": 1},
-                {"matrix": [5, 5], "label": "P", "x": 10, "y": 1},
-                {"matrix": [6, 5], "label": "Backslash", "x": 11, "y": 1},
-                {"matrix": [0, 6], "label": "Quote", "x": 12, "y": 1},
-                {"matrix": [5, 1], "label": "Left", "x": 13, "y": 1},
-                {"matrix": [6, 0], "label": "Right", "x": 14, "y": 1},
-                {"matrix": [0, 2], "label": "Control", "x": 0, "y": 2},
-                {"matrix": [7, 3], "label": "Capslock", "x": 1, "y": 2},
-                {"matrix": [3, 0], "label": "A", "x": 2, "y": 2},
-                {"matrix": [3, 1], "label": "S", "x": 3, "y": 2},
-                {"matrix": [3, 2], "label": "D", "x": 4, "y": 2},
-                {"matrix": [3, 3], "label": "F", "x": 5, "y": 2},
-                {"matrix": [3, 4], "label": "G", "x": 6, "y": 2},
-                {"matrix": [3, 5], "label": "H", "x": 7, "y": 2},
-                {"matrix": [3, 6], "label": "J", "x": 8, "y": 2},
-                {"matrix": [3, 7], "label": "K", "x": 9, "y": 2},
-                {"matrix": [6, 6], "label": "L", "x": 10, "y": 2},
-                {"matrix": [6, 4], "label": "Semicolon", "x": 11, "y": 2},
-                {"matrix": [0, 5], "label": "Return", "x": 12, "y": 2},
-                {"matrix": [6, 1], "label": "Down", "x": 13, "y": 2},
-                {"matrix": [0, 4], "label": "LShift", "x": 0, "y": 3},
-                {"matrix": [4, 0], "label": "Z", "x": 1, "y": 3},
-                {"matrix": [4, 1], "label": "X", "x": 2, "y": 3},
-                {"matrix": [4, 2], "label": "C", "x": 3, "y": 3},
-                {"matrix": [4, 3], "label": "V", "x": 4, "y": 3},
-                {"matrix": [4, 4], "label": "B", "x": 5, "y": 3},
-                {"matrix": [4, 5], "label": "N", "x": 6, "y": 3},
-                {"matrix": [4, 6], "label": "M", "x": 7, "y": 3},
-                {"matrix": [4, 7], "label": "Comma", "x": 8, "y": 3},
-                {"matrix": [5, 4], "label": "Period", "x": 9, "y": 3},
-                {"matrix": [6, 3], "label": "Slash", "x": 10, "y": 3},
-                {"matrix": [5, 3], "label": "Space", "x": 0, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/osborne1/keyboard.json b/keyboards/handwired/osborne1/keyboard.json
new file mode 100644
index 00000000000..8cbcb3cc8bb
--- /dev/null
+++ b/keyboards/handwired/osborne1/keyboard.json
@@ -0,0 +1,92 @@
+{
+    "manufacturer": "crackmonkey",
+    "keyboard_name": "osborne1",
+    "maintainer": "crackmonkey",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+        "bluetooth": true
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["D0", "B7", "B5", "C6", "D1", "B6", "D7", "D6"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x239A",
+        "vid": "0x800C"
+    },
+    "layouts": {
+        "LAYOUT_64_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [1, 0], "label": "1", "x": 1, "y": 0},
+                {"matrix": [1, 1], "label": "2", "x": 2, "y": 0},
+                {"matrix": [1, 2], "label": "3", "x": 3, "y": 0},
+                {"matrix": [1, 3], "label": "4", "x": 4, "y": 0},
+                {"matrix": [1, 4], "label": "5", "x": 5, "y": 0},
+                {"matrix": [1, 5], "label": "6", "x": 6, "y": 0},
+                {"matrix": [1, 6], "label": "7", "x": 7, "y": 0},
+                {"matrix": [1, 7], "label": "8", "x": 8, "y": 0},
+                {"matrix": [5, 7], "label": "9", "x": 9, "y": 0},
+                {"matrix": [5, 2], "label": "0", "x": 10, "y": 0},
+                {"matrix": [6, 2], "label": "-", "x": 11, "y": 0},
+                {"matrix": [6, 7], "label": "=", "x": 12, "y": 0},
+                {"matrix": [0, 7], "label": "[", "x": 13, "y": 0},
+                {"matrix": [5, 0], "label": "Up", "x": 14, "y": 0},
+                {"matrix": [0, 1], "label": "TAB", "x": 0, "y": 1},
+                {"matrix": [2, 0], "label": "Q", "x": 1, "y": 1},
+                {"matrix": [2, 1], "label": "W", "x": 2, "y": 1},
+                {"matrix": [2, 2], "label": "E", "x": 3, "y": 1},
+                {"matrix": [2, 3], "label": "R", "x": 4, "y": 1},
+                {"matrix": [2, 4], "label": "T", "x": 5, "y": 1},
+                {"matrix": [2, 5], "label": "Y", "x": 6, "y": 1},
+                {"matrix": [2, 6], "label": "U", "x": 7, "y": 1},
+                {"matrix": [2, 7], "label": "I", "x": 8, "y": 1},
+                {"matrix": [5, 6], "label": "O", "x": 9, "y": 1},
+                {"matrix": [5, 5], "label": "P", "x": 10, "y": 1},
+                {"matrix": [6, 5], "label": "Backslash", "x": 11, "y": 1},
+                {"matrix": [0, 6], "label": "Quote", "x": 12, "y": 1},
+                {"matrix": [5, 1], "label": "Left", "x": 13, "y": 1},
+                {"matrix": [6, 0], "label": "Right", "x": 14, "y": 1},
+                {"matrix": [0, 2], "label": "Control", "x": 0, "y": 2},
+                {"matrix": [7, 3], "label": "Capslock", "x": 1, "y": 2},
+                {"matrix": [3, 0], "label": "A", "x": 2, "y": 2},
+                {"matrix": [3, 1], "label": "S", "x": 3, "y": 2},
+                {"matrix": [3, 2], "label": "D", "x": 4, "y": 2},
+                {"matrix": [3, 3], "label": "F", "x": 5, "y": 2},
+                {"matrix": [3, 4], "label": "G", "x": 6, "y": 2},
+                {"matrix": [3, 5], "label": "H", "x": 7, "y": 2},
+                {"matrix": [3, 6], "label": "J", "x": 8, "y": 2},
+                {"matrix": [3, 7], "label": "K", "x": 9, "y": 2},
+                {"matrix": [6, 6], "label": "L", "x": 10, "y": 2},
+                {"matrix": [6, 4], "label": "Semicolon", "x": 11, "y": 2},
+                {"matrix": [0, 5], "label": "Return", "x": 12, "y": 2},
+                {"matrix": [6, 1], "label": "Down", "x": 13, "y": 2},
+                {"matrix": [0, 4], "label": "LShift", "x": 0, "y": 3},
+                {"matrix": [4, 0], "label": "Z", "x": 1, "y": 3},
+                {"matrix": [4, 1], "label": "X", "x": 2, "y": 3},
+                {"matrix": [4, 2], "label": "C", "x": 3, "y": 3},
+                {"matrix": [4, 3], "label": "V", "x": 4, "y": 3},
+                {"matrix": [4, 4], "label": "B", "x": 5, "y": 3},
+                {"matrix": [4, 5], "label": "N", "x": 6, "y": 3},
+                {"matrix": [4, 6], "label": "M", "x": 7, "y": 3},
+                {"matrix": [4, 7], "label": "Comma", "x": 8, "y": 3},
+                {"matrix": [5, 4], "label": "Period", "x": 9, "y": 3},
+                {"matrix": [6, 3], "label": "Slash", "x": 10, "y": 3},
+                {"matrix": [5, 3], "label": "Space", "x": 0, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/osborne1/rules.mk b/keyboards/handwired/osborne1/rules.mk
deleted file mode 100644
index 9ccac102c70..00000000000
--- a/keyboards/handwired/osborne1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json
deleted file mode 100644
index f6bd2d2f239..00000000000
--- a/keyboards/handwired/owlet60/info.json
+++ /dev/null
@@ -1,377 +0,0 @@
-{
-    "keyboard_name": "Owlet60",
-    "manufacturer": "worthlessowl",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/owlet60/",
-    "maintainer": "worthlessowl",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xDA19",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "D0"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 8,
-        "max_brightness": 128,
-        "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": "caterina",
-    "debounce": 9,
-    "community_layouts": ["alice", "alice_split_bs"],
-    "layout_aliases": {
-        "LAYOUT_owlet60_60_percent_full_bsp": "LAYOUT_alice",
-        "LAYOUT_owlet60_60_percent_split_bsp": "LAYOUT_alice_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_owlet60_full_bsp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [7, 0], "x": 1.75, "y": 0},
-                {"matrix": [8, 0], "x": 2.75, "y": 0},
-                {"matrix": [7, 1], "x": 3.75, "y": 0},
-                {"matrix": [8, 1], "x": 4.75, "y": 0},
-                {"matrix": [7, 2], "x": 5.75, "y": 0},
-                {"matrix": [8, 2], "x": 6.75, "y": 0},
-                {"matrix": [8, 3], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 4], "x": 9.25, "y": 0},
-                {"matrix": [7, 4], "x": 10.25, "y": 0},
-                {"matrix": [8, 4], "x": 11.25, "y": 0},
-                {"matrix": [7, 5], "x": 12.25, "y": 0},
-                {"matrix": [8, 5], "x": 13.25, "y": 0},
-                {"matrix": [7, 6], "x": 14.25, "y": 0},
-                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
-                {"matrix": [7, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [0, 1], "x": 3, "y": 1},
-                {"matrix": [6, 1], "x": 4, "y": 1},
-                {"matrix": [0, 2], "x": 5, "y": 1},
-                {"matrix": [6, 2], "x": 6, "y": 1},
-                {"matrix": [0, 3], "x": 7, "y": 1},
-
-                {"matrix": [7, 3], "x": 9, "y": 1},
-                {"matrix": [1, 4], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [0, 5], "x": 12, "y": 1},
-                {"matrix": [6, 5], "x": 13, "y": 1},
-                {"matrix": [0, 6], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15, "y": 1},
-                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
-                {"matrix": [6, 7], "x": 17.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [1, 1], "x": 3, "y": 2},
-                {"matrix": [5, 1], "x": 4, "y": 2},
-                {"matrix": [1, 2], "x": 5, "y": 2},
-                {"matrix": [5, 2], "x": 6, "y": 2},
-                {"matrix": [1, 3], "x": 7, "y": 2},
-
-                {"matrix": [6, 3], "x": 9.5, "y": 2},
-                {"matrix": [2, 4], "x": 10.5, "y": 2},
-                {"matrix": [5, 4], "x": 11.5, "y": 2},
-                {"matrix": [1, 5], "x": 12.5, "y": 2},
-                {"matrix": [5, 5], "x": 13.5, "y": 2},
-                {"matrix": [1, 6], "x": 14.5, "y": 2},
-                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
-                {"matrix": [5, 7], "x": 17.75, "y": 2},
-
-                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [2, 1], "x": 3.25, "y": 3},
-                {"matrix": [4, 1], "x": 4.25, "y": 3},
-                {"matrix": [2, 2], "x": 5.25, "y": 3},
-                {"matrix": [4, 2], "x": 6.25, "y": 3},
-                {"matrix": [2, 3], "x": 7.25, "y": 3},
-
-                {"matrix": [5, 3], "x": 9.25, "y": 3},
-                {"matrix": [3, 4], "x": 10.25, "y": 3},
-                {"matrix": [4, 4], "x": 11.25, "y": 3},
-                {"matrix": [2, 5], "x": 12.25, "y": 3},
-                {"matrix": [4, 5], "x": 13.25, "y": 3},
-                {"matrix": [2, 6], "x": 14.25, "y": 3},
-                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
-                {"matrix": [1, 7], "x": 17, "y": 3},
-                {"matrix": [4, 7], "x": 18, "y": 3},
-
-                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
-                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
-                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
-                {"matrix": [3, 6], "x": 16, "y": 4},
-                {"matrix": [2, 7], "x": 17, "y": 4},
-                {"matrix": [3, 7], "x": 18, "y": 4}
-            ]
-        },
-        "LAYOUT_owlet60_split_bsp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [7, 0], "x": 1.75, "y": 0},
-                {"matrix": [8, 0], "x": 2.75, "y": 0},
-                {"matrix": [7, 1], "x": 3.75, "y": 0},
-                {"matrix": [8, 1], "x": 4.75, "y": 0},
-                {"matrix": [7, 2], "x": 5.75, "y": 0},
-                {"matrix": [8, 2], "x": 6.75, "y": 0},
-                {"matrix": [8, 3], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 4], "x": 9.25, "y": 0},
-                {"matrix": [7, 4], "x": 10.25, "y": 0},
-                {"matrix": [8, 4], "x": 11.25, "y": 0},
-                {"matrix": [7, 5], "x": 12.25, "y": 0},
-                {"matrix": [8, 5], "x": 13.25, "y": 0},
-                {"matrix": [7, 6], "x": 14.25, "y": 0},
-                {"matrix": [8, 6], "x": 15.25, "y": 0},
-                {"matrix": [8, 7], "x": 16.25, "y": 0},
-                {"matrix": [7, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [0, 1], "x": 3, "y": 1},
-                {"matrix": [6, 1], "x": 4, "y": 1},
-                {"matrix": [0, 2], "x": 5, "y": 1},
-                {"matrix": [6, 2], "x": 6, "y": 1},
-                {"matrix": [0, 3], "x": 7, "y": 1},
-
-                {"matrix": [7, 3], "x": 9, "y": 1},
-                {"matrix": [1, 4], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [0, 5], "x": 12, "y": 1},
-                {"matrix": [6, 5], "x": 13, "y": 1},
-                {"matrix": [0, 6], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15, "y": 1},
-                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
-                {"matrix": [6, 7], "x": 17.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [1, 1], "x": 3, "y": 2},
-                {"matrix": [5, 1], "x": 4, "y": 2},
-                {"matrix": [1, 2], "x": 5, "y": 2},
-                {"matrix": [5, 2], "x": 6, "y": 2},
-                {"matrix": [1, 3], "x": 7, "y": 2},
-
-                {"matrix": [6, 3], "x": 9.5, "y": 2},
-                {"matrix": [2, 4], "x": 10.5, "y": 2},
-                {"matrix": [5, 4], "x": 11.5, "y": 2},
-                {"matrix": [1, 5], "x": 12.5, "y": 2},
-                {"matrix": [5, 5], "x": 13.5, "y": 2},
-                {"matrix": [1, 6], "x": 14.5, "y": 2},
-                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
-                {"matrix": [5, 7], "x": 17.75, "y": 2},
-
-                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [2, 1], "x": 3.25, "y": 3},
-                {"matrix": [4, 1], "x": 4.25, "y": 3},
-                {"matrix": [2, 2], "x": 5.25, "y": 3},
-                {"matrix": [4, 2], "x": 6.25, "y": 3},
-                {"matrix": [2, 3], "x": 7.25, "y": 3},
-
-                {"matrix": [5, 3], "x": 9.25, "y": 3},
-                {"matrix": [3, 4], "x": 10.25, "y": 3},
-                {"matrix": [4, 4], "x": 11.25, "y": 3},
-                {"matrix": [2, 5], "x": 12.25, "y": 3},
-                {"matrix": [4, 5], "x": 13.25, "y": 3},
-                {"matrix": [2, 6], "x": 14.25, "y": 3},
-                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
-                {"matrix": [1, 7], "x": 17, "y": 3},
-                {"matrix": [4, 7], "x": 18, "y": 3},
-
-                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
-                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
-                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
-                {"matrix": [3, 6], "x": 16, "y": 4},
-                {"matrix": [2, 7], "x": 17, "y": 4},
-                {"matrix": [3, 7], "x": 18, "y": 4}
-            ]
-        },
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [7, 0], "x": 1.75, "y": 0},
-                {"matrix": [8, 0], "x": 2.75, "y": 0},
-                {"matrix": [7, 1], "x": 3.75, "y": 0},
-                {"matrix": [8, 1], "x": 4.75, "y": 0},
-                {"matrix": [7, 2], "x": 5.75, "y": 0},
-                {"matrix": [8, 2], "x": 6.75, "y": 0},
-                {"matrix": [8, 3], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 4], "x": 9.25, "y": 0},
-                {"matrix": [7, 4], "x": 10.25, "y": 0},
-                {"matrix": [8, 4], "x": 11.25, "y": 0},
-                {"matrix": [7, 5], "x": 12.25, "y": 0},
-                {"matrix": [8, 5], "x": 13.25, "y": 0},
-                {"matrix": [7, 6], "x": 14.25, "y": 0},
-                {"matrix": [8, 6], "x": 15.25, "y": 0},
-                {"matrix": [8, 7], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [0, 1], "x": 3, "y": 1},
-                {"matrix": [6, 1], "x": 4, "y": 1},
-                {"matrix": [0, 2], "x": 5, "y": 1},
-                {"matrix": [6, 2], "x": 6, "y": 1},
-                {"matrix": [0, 3], "x": 7, "y": 1},
-
-                {"matrix": [7, 3], "x": 9, "y": 1},
-                {"matrix": [1, 4], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [0, 5], "x": 12, "y": 1},
-                {"matrix": [6, 5], "x": 13, "y": 1},
-                {"matrix": [0, 6], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15, "y": 1},
-                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [1, 1], "x": 3, "y": 2},
-                {"matrix": [5, 1], "x": 4, "y": 2},
-                {"matrix": [1, 2], "x": 5, "y": 2},
-                {"matrix": [5, 2], "x": 6, "y": 2},
-                {"matrix": [1, 3], "x": 7, "y": 2},
-
-                {"matrix": [6, 3], "x": 9.5, "y": 2},
-                {"matrix": [2, 4], "x": 10.5, "y": 2},
-                {"matrix": [5, 4], "x": 11.5, "y": 2},
-                {"matrix": [1, 5], "x": 12.5, "y": 2},
-                {"matrix": [5, 5], "x": 13.5, "y": 2},
-                {"matrix": [1, 6], "x": 14.5, "y": 2},
-                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [2, 1], "x": 3.25, "y": 3},
-                {"matrix": [4, 1], "x": 4.25, "y": 3},
-                {"matrix": [2, 2], "x": 5.25, "y": 3},
-                {"matrix": [4, 2], "x": 6.25, "y": 3},
-                {"matrix": [2, 3], "x": 7.25, "y": 3},
-
-                {"matrix": [5, 3], "x": 9.25, "y": 3},
-                {"matrix": [3, 4], "x": 10.25, "y": 3},
-                {"matrix": [4, 4], "x": 11.25, "y": 3},
-                {"matrix": [2, 5], "x": 12.25, "y": 3},
-                {"matrix": [4, 5], "x": 13.25, "y": 3},
-                {"matrix": [2, 6], "x": 14.25, "y": 3},
-                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
-                {"matrix": [1, 7], "x": 17, "y": 3},
-
-                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
-                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
-                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
-                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [7, 0], "x": 1.75, "y": 0},
-                {"matrix": [8, 0], "x": 2.75, "y": 0},
-                {"matrix": [7, 1], "x": 3.75, "y": 0},
-                {"matrix": [8, 1], "x": 4.75, "y": 0},
-                {"matrix": [7, 2], "x": 5.75, "y": 0},
-                {"matrix": [8, 2], "x": 6.75, "y": 0},
-                {"matrix": [8, 3], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 4], "x": 9.25, "y": 0},
-                {"matrix": [7, 4], "x": 10.25, "y": 0},
-                {"matrix": [8, 4], "x": 11.25, "y": 0},
-                {"matrix": [7, 5], "x": 12.25, "y": 0},
-                {"matrix": [8, 5], "x": 13.25, "y": 0},
-                {"matrix": [7, 6], "x": 14.25, "y": 0},
-                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [0, 1], "x": 3, "y": 1},
-                {"matrix": [6, 1], "x": 4, "y": 1},
-                {"matrix": [0, 2], "x": 5, "y": 1},
-                {"matrix": [6, 2], "x": 6, "y": 1},
-                {"matrix": [0, 3], "x": 7, "y": 1},
-
-                {"matrix": [7, 3], "x": 9, "y": 1},
-                {"matrix": [1, 4], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [0, 5], "x": 12, "y": 1},
-                {"matrix": [6, 5], "x": 13, "y": 1},
-                {"matrix": [0, 6], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15, "y": 1},
-                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [1, 1], "x": 3, "y": 2},
-                {"matrix": [5, 1], "x": 4, "y": 2},
-                {"matrix": [1, 2], "x": 5, "y": 2},
-                {"matrix": [5, 2], "x": 6, "y": 2},
-                {"matrix": [1, 3], "x": 7, "y": 2},
-
-                {"matrix": [6, 3], "x": 9.5, "y": 2},
-                {"matrix": [2, 4], "x": 10.5, "y": 2},
-                {"matrix": [5, 4], "x": 11.5, "y": 2},
-                {"matrix": [1, 5], "x": 12.5, "y": 2},
-                {"matrix": [5, 5], "x": 13.5, "y": 2},
-                {"matrix": [1, 6], "x": 14.5, "y": 2},
-                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [2, 1], "x": 3.25, "y": 3},
-                {"matrix": [4, 1], "x": 4.25, "y": 3},
-                {"matrix": [2, 2], "x": 5.25, "y": 3},
-                {"matrix": [4, 2], "x": 6.25, "y": 3},
-                {"matrix": [2, 3], "x": 7.25, "y": 3},
-
-                {"matrix": [5, 3], "x": 9.25, "y": 3},
-                {"matrix": [3, 4], "x": 10.25, "y": 3},
-                {"matrix": [4, 4], "x": 11.25, "y": 3},
-                {"matrix": [2, 5], "x": 12.25, "y": 3},
-                {"matrix": [4, 5], "x": 13.25, "y": 3},
-                {"matrix": [2, 6], "x": 14.25, "y": 3},
-                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
-                {"matrix": [1, 7], "x": 17, "y": 3},
-
-                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
-                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
-                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
-                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/owlet60/keyboard.json b/keyboards/handwired/owlet60/keyboard.json
new file mode 100644
index 00000000000..8108f51985d
--- /dev/null
+++ b/keyboards/handwired/owlet60/keyboard.json
@@ -0,0 +1,384 @@
+{
+    "keyboard_name": "Owlet60",
+    "manufacturer": "worthlessowl",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/owlet60/",
+    "maintainer": "worthlessowl",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xDA19",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "max_brightness": 128,
+        "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": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "debounce": 9,
+    "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_owlet60_60_percent_full_bsp": "LAYOUT_alice",
+        "LAYOUT_owlet60_60_percent_split_bsp": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_owlet60_full_bsp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [7, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [6, 7], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+                {"matrix": [4, 7], "x": 18, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [3, 6], "x": 16, "y": 4},
+                {"matrix": [2, 7], "x": 17, "y": 4},
+                {"matrix": [3, 7], "x": 18, "y": 4}
+            ]
+        },
+        "LAYOUT_owlet60_split_bsp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 7], "x": 16.25, "y": 0},
+                {"matrix": [7, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [6, 7], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+                {"matrix": [4, 7], "x": 18, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [3, 6], "x": 16, "y": 4},
+                {"matrix": [2, 7], "x": 17, "y": 4},
+                {"matrix": [3, 7], "x": 18, "y": 4}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 7], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/owlet60/rules.mk b/keyboards/handwired/owlet60/rules.mk
index dd125034f29..09c02c88b0d 100644
--- a/keyboards/handwired/owlet60/rules.mk
+++ b/keyboards/handwired/owlet60/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 = 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
-OLED_ENABLE = no
 
 SRC += matrix.c
diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/info.json
deleted file mode 100644
index 8d85a2e9300..00000000000
--- a/keyboards/handwired/pill60/blackpill_f401/info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
-        "rows": ["B4", "B3", "A15", "B13", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/pill60/blackpill_f401/keyboard.json b/keyboards/handwired/pill60/blackpill_f401/keyboard.json
new file mode 100644
index 00000000000..9b3530b9583
--- /dev/null
+++ b/keyboards/handwired/pill60/blackpill_f401/keyboard.json
@@ -0,0 +1,15 @@
+{
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+        "rows": ["B4", "B3", "A15", "B13", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F401"
+}
diff --git a/keyboards/handwired/pill60/blackpill_f401/rules.mk b/keyboards/handwired/pill60/blackpill_f401/rules.mk
deleted file mode 100644
index 3d2bfceea99..00000000000
--- a/keyboards/handwired/pill60/blackpill_f401/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP       = yes
diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/info.json
deleted file mode 100644
index 4e0935f79ce..00000000000
--- a/keyboards/handwired/pill60/blackpill_f411/info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
-        "rows": ["B4", "B3", "A15", "B13", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/handwired/pill60/blackpill_f411/keyboard.json b/keyboards/handwired/pill60/blackpill_f411/keyboard.json
new file mode 100644
index 00000000000..1961d616ddb
--- /dev/null
+++ b/keyboards/handwired/pill60/blackpill_f411/keyboard.json
@@ -0,0 +1,15 @@
+{
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+        "rows": ["B4", "B3", "A15", "B13", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F411"
+}
diff --git a/keyboards/handwired/pill60/blackpill_f411/rules.mk b/keyboards/handwired/pill60/blackpill_f411/rules.mk
deleted file mode 100644
index b5f27c93eab..00000000000
--- a/keyboards/handwired/pill60/blackpill_f411/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/postageboard/mini/info.json b/keyboards/handwired/postageboard/mini/info.json
deleted file mode 100644
index b6944f2916d..00000000000
--- a/keyboards/handwired/postageboard/mini/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B3", "B7"],
-        "rows": ["D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/handwired/postageboard/mini/keyboard.json b/keyboards/handwired/postageboard/mini/keyboard.json
new file mode 100644
index 00000000000..13e83147bbd
--- /dev/null
+++ b/keyboards/handwired/postageboard/mini/keyboard.json
@@ -0,0 +1,19 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B3", "B7"],
+        "rows": ["D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    }
+}
diff --git a/keyboards/handwired/postageboard/mini/rules.mk b/keyboards/handwired/postageboard/mini/rules.mk
deleted file mode 100644
index 309e55c9f4c..00000000000
--- a/keyboards/handwired/postageboard/mini/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 = 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/handwired/postageboard/r1/info.json b/keyboards/handwired/postageboard/r1/info.json
deleted file mode 100644
index a1ea87df869..00000000000
--- a/keyboards/handwired/postageboard/r1/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B7", "C6", "C7"],
-        "rows": ["B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/handwired/postageboard/r1/keyboard.json b/keyboards/handwired/postageboard/r1/keyboard.json
new file mode 100644
index 00000000000..78ab5d028e0
--- /dev/null
+++ b/keyboards/handwired/postageboard/r1/keyboard.json
@@ -0,0 +1,19 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "C6", "C7"],
+        "rows": ["B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    }
+}
diff --git a/keyboards/handwired/postageboard/r1/rules.mk b/keyboards/handwired/postageboard/r1/rules.mk
deleted file mode 100644
index 309e55c9f4c..00000000000
--- a/keyboards/handwired/postageboard/r1/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 = 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/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/info.json
deleted file mode 100644
index a89fe9ec57f..00000000000
--- a/keyboards/handwired/prkl30/feather/info.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 13,
-        "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": "D1"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D1", "B7", "D6", "C7", "B6", "B5", "D7", "C6", "D0"],
-        "rows": ["F4", "F1", "F0", "D2"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F7", "pin_b": "F6"}
-        ]
-    }
-}
diff --git a/keyboards/handwired/prkl30/feather/keyboard.json b/keyboards/handwired/prkl30/feather/keyboard.json
new file mode 100644
index 00000000000..721107e0646
--- /dev/null
+++ b/keyboards/handwired/prkl30/feather/keyboard.json
@@ -0,0 +1,45 @@
+{
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "encoder": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "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": "D1"
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D1", "B7", "D6", "C7", "B6", "B5", "D7", "C6", "D0"],
+        "rows": ["F4", "F1", "F0", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F7", "pin_b": "F6"}
+        ]
+    }
+}
diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk
index aaab95b9e04..3437a35bdf1 100644
--- a/keyboards/handwired/prkl30/feather/rules.mk
+++ b/keyboards/handwired/prkl30/feather/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
-ENCODER_ENABLE = yes
-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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no
-AUDIO_ENABLE  = no          # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE  = no       # This can be enabled if a ws2812 strip is connected to the expansion port.
-
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json
deleted file mode 100644
index c26325069b4..00000000000
--- a/keyboards/handwired/promethium/info.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "keyboard_name": "Promethium",
-  "manufacturer": "Priyadi",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x17EF",
-    "pid": "0x6048",
-    "device_version": "0.0.1"
-  },
-  "ws2812": {
-    "pin": "B5"
-  },
-  "bluetooth": {
-    "driver": "bluefruit_le"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.5},
-        {"matrix": [0, 1], "x": 1, "y": 0.3},
-        {"matrix": [0, 2], "x": 2, "y": 0.15},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0.15},
-        {"matrix": [0, 5], "x": 5, "y": 0.15},
-
-        {"matrix": [4, 0], "x": 10, "y": 0.15},
-        {"matrix": [4, 1], "x": 11, "y": 0.15},
-        {"matrix": [4, 2], "x": 12, "y": 0},
-        {"matrix": [4, 3], "x": 13, "y": 0.15},
-        {"matrix": [4, 4], "x": 14, "y": 0.3},
-        {"matrix": [4, 5], "x": 15, "y": 0.5},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.5},
-        {"matrix": [1, 1], "x": 1, "y": 1.3},
-        {"matrix": [1, 2], "x": 2, "y": 1.15},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.15},
-        {"matrix": [1, 5], "x": 5, "y": 1.15},
-
-        {"matrix": [5, 0], "x": 10, "y": 1.15},
-        {"matrix": [5, 1], "x": 11, "y": 1.15},
-        {"matrix": [5, 2], "x": 12, "y": 1},
-        {"matrix": [5, 3], "x": 13, "y": 1.15},
-        {"matrix": [5, 4], "x": 14, "y": 1.3},
-        {"matrix": [5, 5], "x": 15, "y": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.5},
-        {"matrix": [2, 1], "x": 1, "y": 2.3},
-        {"matrix": [2, 2], "x": 2, "y": 2.15},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2.15},
-        {"matrix": [2, 5], "x": 5, "y": 2.15},
-
-        {"matrix": [6, 0], "x": 10, "y": 2.15},
-        {"matrix": [6, 1], "x": 11, "y": 2.15},
-        {"matrix": [6, 2], "x": 12, "y": 2},
-        {"matrix": [6, 3], "x": 13, "y": 2.15},
-        {"matrix": [6, 4], "x": 14, "y": 2.3},
-        {"matrix": [6, 5], "x": 15, "y": 2.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.5},
-        {"matrix": [3, 1], "x": 1, "y": 3.3},
-        {"matrix": [3, 2], "x": 2, "y": 3.15},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3.15},
-        {"matrix": [3, 5], "x": 5, "y": 3.15},
-
-        {"matrix": [7, 0], "x": 10, "y": 3.15},
-        {"matrix": [7, 1], "x": 11, "y": 3.15},
-        {"matrix": [7, 2], "x": 12, "y": 3},
-        {"matrix": [7, 3], "x": 13, "y": 3.15},
-        {"matrix": [7, 4], "x": 14, "y": 3.3},
-        {"matrix": [7, 5], "x": 15, "y": 3.5},
-
-        {"matrix": [8, 0], "x": 6.5, "y": 3.15},
-        {"matrix": [8, 1], "x": 7.5, "y": 3.15},
-        {"matrix": [8, 2], "x": 8.5, "y": 3.15}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/promethium/keyboard.json b/keyboards/handwired/promethium/keyboard.json
new file mode 100644
index 00000000000..6ee1ed8ca19
--- /dev/null
+++ b/keyboards/handwired/promethium/keyboard.json
@@ -0,0 +1,96 @@
+{
+  "keyboard_name": "Promethium",
+  "manufacturer": "Priyadi",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x17EF",
+    "pid": "0x6048",
+    "device_version": "0.0.1"
+  },
+  "ws2812": {
+    "pin": "B5"
+  },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "nkro": true,
+    "ps2_mouse": true,
+    "ps2": true,
+    "bluetooth": true
+  },
+  "build": {
+    "lto": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.5},
+        {"matrix": [0, 1], "x": 1, "y": 0.3},
+        {"matrix": [0, 2], "x": 2, "y": 0.15},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.15},
+        {"matrix": [0, 5], "x": 5, "y": 0.15},
+
+        {"matrix": [4, 0], "x": 10, "y": 0.15},
+        {"matrix": [4, 1], "x": 11, "y": 0.15},
+        {"matrix": [4, 2], "x": 12, "y": 0},
+        {"matrix": [4, 3], "x": 13, "y": 0.15},
+        {"matrix": [4, 4], "x": 14, "y": 0.3},
+        {"matrix": [4, 5], "x": 15, "y": 0.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.3},
+        {"matrix": [1, 2], "x": 2, "y": 1.15},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.15},
+        {"matrix": [1, 5], "x": 5, "y": 1.15},
+
+        {"matrix": [5, 0], "x": 10, "y": 1.15},
+        {"matrix": [5, 1], "x": 11, "y": 1.15},
+        {"matrix": [5, 2], "x": 12, "y": 1},
+        {"matrix": [5, 3], "x": 13, "y": 1.15},
+        {"matrix": [5, 4], "x": 14, "y": 1.3},
+        {"matrix": [5, 5], "x": 15, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5},
+        {"matrix": [2, 1], "x": 1, "y": 2.3},
+        {"matrix": [2, 2], "x": 2, "y": 2.15},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.15},
+        {"matrix": [2, 5], "x": 5, "y": 2.15},
+
+        {"matrix": [6, 0], "x": 10, "y": 2.15},
+        {"matrix": [6, 1], "x": 11, "y": 2.15},
+        {"matrix": [6, 2], "x": 12, "y": 2},
+        {"matrix": [6, 3], "x": 13, "y": 2.15},
+        {"matrix": [6, 4], "x": 14, "y": 2.3},
+        {"matrix": [6, 5], "x": 15, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5},
+        {"matrix": [3, 1], "x": 1, "y": 3.3},
+        {"matrix": [3, 2], "x": 2, "y": 3.15},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3.15},
+        {"matrix": [3, 5], "x": 5, "y": 3.15},
+
+        {"matrix": [7, 0], "x": 10, "y": 3.15},
+        {"matrix": [7, 1], "x": 11, "y": 3.15},
+        {"matrix": [7, 2], "x": 12, "y": 3},
+        {"matrix": [7, 3], "x": 13, "y": 3.15},
+        {"matrix": [7, 4], "x": 14, "y": 3.3},
+        {"matrix": [7, 5], "x": 15, "y": 3.5},
+
+        {"matrix": [8, 0], "x": 6.5, "y": 3.15},
+        {"matrix": [8, 1], "x": 7.5, "y": 3.15},
+        {"matrix": [8, 2], "x": 8.5, "y": 3.15}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk
index d6b97ed8100..7f208800663 100644
--- a/keyboards/handwired/promethium/rules.mk
+++ b/keyboards/handwired/promethium/rules.mk
@@ -1,28 +1,11 @@
 # 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
 PS2_DRIVER = interrupt
 CUSTOM_MATRIX = yes
-BLUETOOTH_ENABLE = yes
 
 WS2812_DRIVER_REQUIRED = yes
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += rgbsps.c
 SRC += matrix.c
-
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/info.json
deleted file mode 100644
index ad83f34999d..00000000000
--- a/keyboards/handwired/pterodactyl/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "keyboard_name": "Pterodactyl",
-  "manufacturer": "myoung34",
-  "url": "https://marcyoung.us/post/pterodactyl/",
-  "maintainer": "Marcus Young",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1308",
-    "device_version": "0.0.2"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "debounce": 0,
-  "tapping": {
-    "toggle": 1
-  },
-  "bluetooth": {
-    "driver": "bluefruit_le"
-  },
-  "layouts": {
-    "LAYOUT_pterodactyl": {
-      "layout": [
-        {"matrix": [0, 11], "x": 0, "y": 0},
-        {"matrix": [0, 10], "x": 1, "y": 0},
-        {"matrix": [0, 9], "x": 2, "y": 0},
-        {"matrix": [0, 8], "x": 3, "y": 0},
-        {"matrix": [0, 7], "x": 4, "y": 0},
-        {"matrix": [0, 6], "x": 5, "y": 0},
-
-        {"matrix": [0, 5], "x": 11, "y": 0},
-        {"matrix": [0, 4], "x": 12, "y": 0},
-        {"matrix": [0, 3], "x": 13, "y": 0},
-        {"matrix": [0, 2], "x": 14, "y": 0},
-        {"matrix": [0, 1], "x": 15, "y": 0},
-        {"matrix": [0, 0], "x": 16, "y": 0},
-
-        {"matrix": [1, 11], "x": 0, "y": 1},
-        {"matrix": [1, 10], "x": 1, "y": 1},
-        {"matrix": [1, 9], "x": 2, "y": 1},
-        {"matrix": [1, 8], "x": 3, "y": 1},
-        {"matrix": [1, 7], "x": 4, "y": 1},
-        {"matrix": [1, 6], "x": 5, "y": 1},
-
-        {"matrix": [1, 5], "x": 11, "y": 1},
-        {"matrix": [1, 4], "x": 12, "y": 1},
-        {"matrix": [1, 3], "x": 13, "y": 1},
-        {"matrix": [1, 2], "x": 14, "y": 1},
-        {"matrix": [1, 1], "x": 15, "y": 1},
-        {"matrix": [1, 0], "x": 16, "y": 1},
-
-        {"matrix": [2, 11], "x": 0, "y": 2},
-        {"matrix": [2, 10], "x": 1, "y": 2},
-        {"matrix": [2, 9], "x": 2, "y": 2},
-        {"matrix": [2, 8], "x": 3, "y": 2},
-        {"matrix": [2, 7], "x": 4, "y": 2},
-        {"matrix": [2, 6], "x": 5, "y": 2},
-
-        {"matrix": [2, 5], "x": 11, "y": 2},
-        {"matrix": [2, 4], "x": 12, "y": 2},
-        {"matrix": [2, 3], "x": 13, "y": 2},
-        {"matrix": [2, 2], "x": 14, "y": 2},
-        {"matrix": [2, 1], "x": 15, "y": 2},
-        {"matrix": [2, 0], "x": 16, "y": 2},
-
-        {"matrix": [3, 11], "x": 0, "y": 3},
-        {"matrix": [3, 10], "x": 1, "y": 3},
-        {"matrix": [3, 9], "x": 2, "y": 3},
-        {"matrix": [3, 8], "x": 3, "y": 3},
-        {"matrix": [3, 7], "x": 4, "y": 3},
-        {"matrix": [3, 6], "x": 5, "y": 3},
-
-        {"matrix": [3, 5], "x": 11, "y": 3},
-        {"matrix": [3, 4], "x": 12, "y": 3},
-        {"matrix": [3, 3], "x": 13, "y": 3},
-        {"matrix": [3, 2], "x": 14, "y": 3},
-        {"matrix": [3, 1], "x": 15, "y": 3},
-        {"matrix": [3, 0], "x": 16, "y": 3},
-
-        {"matrix": [4, 11], "x": 0, "y": 4},
-        {"matrix": [4, 10], "x": 1, "y": 4},
-        {"matrix": [4, 9], "x": 2, "y": 4},
-        {"matrix": [4, 8], "x": 3, "y": 4},
-        {"matrix": [4, 7], "x": 4, "y": 4},
-
-        {"matrix": [4, 4], "x": 12, "y": 4},
-        {"matrix": [4, 3], "x": 13, "y": 4},
-        {"matrix": [4, 2], "x": 14, "y": 4},
-        {"matrix": [4, 1], "x": 15, "y": 4},
-        {"matrix": [4, 0], "x": 16, "y": 4},
-
-        {"matrix": [5, 11], "x": 6, "y": 5},
-        {"matrix": [5, 10], "x": 7, "y": 5},
-
-        {"matrix": [5, 1], "x": 9, "y": 5},
-        {"matrix": [5, 0], "x": 10, "y": 5},
-
-        {"matrix": [5, 9], "x": 7, "y": 6},
-
-        {"matrix": [5, 2], "x": 9, "y": 6},
-
-        {"matrix": [4, 6], "x": 5, "y": 6, "h": 2},
-        {"matrix": [5, 7], "x": 6, "y": 6, "h": 2},
-        {"matrix": [5, 8], "x": 7, "y": 7},
-
-        {"matrix": [5, 3], "x": 9, "y": 7},
-        {"matrix": [5, 4], "x": 10, "y": 6, "h": 2},
-        {"matrix": [4, 5], "x": 11, "y": 6, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/pterodactyl/keyboard.json b/keyboards/handwired/pterodactyl/keyboard.json
new file mode 100644
index 00000000000..fac20aeebe1
--- /dev/null
+++ b/keyboards/handwired/pterodactyl/keyboard.json
@@ -0,0 +1,120 @@
+{
+  "keyboard_name": "Pterodactyl",
+  "manufacturer": "myoung34",
+  "url": "https://marcyoung.us/post/pterodactyl/",
+  "maintainer": "Marcus Young",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1308",
+    "device_version": "0.0.2"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "nkro": true,
+    "unicode": true,
+    "bluetooth": true
+  },
+  "debounce": 0,
+  "tapping": {
+    "toggle": 1
+  },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
+  "layouts": {
+    "LAYOUT_pterodactyl": {
+      "layout": [
+        {"matrix": [0, 11], "x": 0, "y": 0},
+        {"matrix": [0, 10], "x": 1, "y": 0},
+        {"matrix": [0, 9], "x": 2, "y": 0},
+        {"matrix": [0, 8], "x": 3, "y": 0},
+        {"matrix": [0, 7], "x": 4, "y": 0},
+        {"matrix": [0, 6], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 11, "y": 0},
+        {"matrix": [0, 4], "x": 12, "y": 0},
+        {"matrix": [0, 3], "x": 13, "y": 0},
+        {"matrix": [0, 2], "x": 14, "y": 0},
+        {"matrix": [0, 1], "x": 15, "y": 0},
+        {"matrix": [0, 0], "x": 16, "y": 0},
+
+        {"matrix": [1, 11], "x": 0, "y": 1},
+        {"matrix": [1, 10], "x": 1, "y": 1},
+        {"matrix": [1, 9], "x": 2, "y": 1},
+        {"matrix": [1, 8], "x": 3, "y": 1},
+        {"matrix": [1, 7], "x": 4, "y": 1},
+        {"matrix": [1, 6], "x": 5, "y": 1},
+
+        {"matrix": [1, 5], "x": 11, "y": 1},
+        {"matrix": [1, 4], "x": 12, "y": 1},
+        {"matrix": [1, 3], "x": 13, "y": 1},
+        {"matrix": [1, 2], "x": 14, "y": 1},
+        {"matrix": [1, 1], "x": 15, "y": 1},
+        {"matrix": [1, 0], "x": 16, "y": 1},
+
+        {"matrix": [2, 11], "x": 0, "y": 2},
+        {"matrix": [2, 10], "x": 1, "y": 2},
+        {"matrix": [2, 9], "x": 2, "y": 2},
+        {"matrix": [2, 8], "x": 3, "y": 2},
+        {"matrix": [2, 7], "x": 4, "y": 2},
+        {"matrix": [2, 6], "x": 5, "y": 2},
+
+        {"matrix": [2, 5], "x": 11, "y": 2},
+        {"matrix": [2, 4], "x": 12, "y": 2},
+        {"matrix": [2, 3], "x": 13, "y": 2},
+        {"matrix": [2, 2], "x": 14, "y": 2},
+        {"matrix": [2, 1], "x": 15, "y": 2},
+        {"matrix": [2, 0], "x": 16, "y": 2},
+
+        {"matrix": [3, 11], "x": 0, "y": 3},
+        {"matrix": [3, 10], "x": 1, "y": 3},
+        {"matrix": [3, 9], "x": 2, "y": 3},
+        {"matrix": [3, 8], "x": 3, "y": 3},
+        {"matrix": [3, 7], "x": 4, "y": 3},
+        {"matrix": [3, 6], "x": 5, "y": 3},
+
+        {"matrix": [3, 5], "x": 11, "y": 3},
+        {"matrix": [3, 4], "x": 12, "y": 3},
+        {"matrix": [3, 3], "x": 13, "y": 3},
+        {"matrix": [3, 2], "x": 14, "y": 3},
+        {"matrix": [3, 1], "x": 15, "y": 3},
+        {"matrix": [3, 0], "x": 16, "y": 3},
+
+        {"matrix": [4, 11], "x": 0, "y": 4},
+        {"matrix": [4, 10], "x": 1, "y": 4},
+        {"matrix": [4, 9], "x": 2, "y": 4},
+        {"matrix": [4, 8], "x": 3, "y": 4},
+        {"matrix": [4, 7], "x": 4, "y": 4},
+
+        {"matrix": [4, 4], "x": 12, "y": 4},
+        {"matrix": [4, 3], "x": 13, "y": 4},
+        {"matrix": [4, 2], "x": 14, "y": 4},
+        {"matrix": [4, 1], "x": 15, "y": 4},
+        {"matrix": [4, 0], "x": 16, "y": 4},
+
+        {"matrix": [5, 11], "x": 6, "y": 5},
+        {"matrix": [5, 10], "x": 7, "y": 5},
+
+        {"matrix": [5, 1], "x": 9, "y": 5},
+        {"matrix": [5, 0], "x": 10, "y": 5},
+
+        {"matrix": [5, 9], "x": 7, "y": 6},
+
+        {"matrix": [5, 2], "x": 9, "y": 6},
+
+        {"matrix": [4, 6], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 7], "x": 6, "y": 6, "h": 2},
+        {"matrix": [5, 8], "x": 7, "y": 7},
+
+        {"matrix": [5, 3], "x": 9, "y": 7},
+        {"matrix": [5, 4], "x": 10, "y": 6, "h": 2},
+        {"matrix": [4, 5], "x": 11, "y": 6, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/pterodactyl/rules.mk b/keyboards/handwired/pterodactyl/rules.mk
index 108e1498a83..e332a03eaac 100644
--- a/keyboards/handwired/pterodactyl/rules.mk
+++ b/keyboards/handwired/pterodactyl/rules.mk
@@ -1,21 +1,7 @@
 # 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 = 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
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = yes
-BLUETOOTH_ENABLE = yes
 
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json
deleted file mode 100644
index 933973d5f39..00000000000
--- a/keyboards/handwired/riblee_f401/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "keyboard_name": "Handwired F401",
-    "manufacturer": "Riblee",
-    "url": "",
-    "maintainer": "riblee",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x002A",
-        "device_version": "0.0.1"
-    },
-    "tapping": {
-        "term": 175
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
-        "rows": ["A6", "A5", "A4", "A3", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "A0",
-        "levels": 5
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401",
-    "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/handwired/riblee_f401/keyboard.json b/keyboards/handwired/riblee_f401/keyboard.json
new file mode 100644
index 00000000000..18d46b55cd0
--- /dev/null
+++ b/keyboards/handwired/riblee_f401/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Handwired F401",
+    "manufacturer": "Riblee",
+    "url": "",
+    "maintainer": "riblee",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x002A",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+             "keyboard": true
+        }
+    },
+    "tapping": {
+        "term": 175
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["A6", "A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "A0",
+        "levels": 5
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true
+    },
+    "board": "BLACKPILL_STM32_F401",
+    "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/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk
deleted file mode 100644
index 4c2d255a184..00000000000
--- a/keyboards/handwired/riblee_f401/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
-KEYBOARD_SHARED_EP = yes
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/info.json
deleted file mode 100644
index 1c957e99404..00000000000
--- a/keyboards/handwired/riblee_f411/info.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-    "keyboard_name": "Handwired F411",
-    "manufacturer": "Riblee",
-    "url": "",
-    "maintainer": "riblee",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x002B",
-        "device_version": "0.0.1"
-    },
-    "tapping": {
-        "term": 175
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B14", "A0", "B8", "B9"],
-        "rows": ["A6", "A5", "A4", "A3", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411",
-    "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/handwired/riblee_f411/keyboard.json b/keyboards/handwired/riblee_f411/keyboard.json
new file mode 100644
index 00000000000..9c7df63b3e1
--- /dev/null
+++ b/keyboards/handwired/riblee_f411/keyboard.json
@@ -0,0 +1,102 @@
+{
+    "keyboard_name": "Handwired F411",
+    "manufacturer": "Riblee",
+    "url": "",
+    "maintainer": "riblee",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x002B",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+             "keyboard": true
+        }
+    },
+    "tapping": {
+        "term": 175
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B14", "A0", "B8", "B9"],
+        "rows": ["A6", "A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "board": "BLACKPILL_STM32_F411",
+    "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/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk
deleted file mode 100644
index 4741169e4db..00000000000
--- a/keyboards/handwired/riblee_f411/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
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-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/handwired/riblee_split/info.json b/keyboards/handwired/riblee_split/keyboard.json
similarity index 100%
rename from keyboards/handwired/riblee_split/info.json
rename to keyboards/handwired/riblee_split/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottoslant/info.json b/keyboards/handwired/scottokeebs/scottoslant/info.json
deleted file mode 100644
index ebaa1b530c2..00000000000
--- a/keyboards/handwired/scottokeebs/scottoslant/info.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "manufacturer": "ScottoKeebs",
-    "keyboard_name": "ScottoSlant",
-    "maintainer": "joe-scotto",
-    "development_board": "promicro",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
-        "rows": ["B1", "B3", "B2", "B6"]
-    },
-    "url": "https://scottokeebs.com",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0004",
-        "vid": "0x534B"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                // Row 1
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [0, 8], "x": 8, "y": 0 },
-                { "matrix": [0, 9], "x": 9, "y": 0 },
-
-                // Row 2
-                { "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 },
-
-                // Row 3
-                { "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 },
-
-                // Row 4
-                { "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, 6], "x": 6, "y": 3 },
-                { "matrix": [3, 7], "x": 7, "y": 3 },
-                { "matrix": [3, 8], "x": 8, "y": 3 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/scottokeebs/scottoslant/keyboard.json b/keyboards/handwired/scottokeebs/scottoslant/keyboard.json
new file mode 100644
index 00000000000..8c9de39cd6d
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoslant/keyboard.json
@@ -0,0 +1,78 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "ScottoSlant",
+    "maintainer": "joe-scotto",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x534B"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                // Row 1
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+
+                // Row 2
+                { "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 },
+
+                // Row 3
+                { "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 },
+
+                // Row 4
+                { "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, 6], "x": 6, "y": 3 },
+                { "matrix": [3, 7], "x": 7, "y": 3 },
+                { "matrix": [3, 8], "x": 8, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/scottokeebs/scottoslant/rules.mk b/keyboards/handwired/scottokeebs/scottoslant/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/handwired/scottokeebs/scottoslant/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json
deleted file mode 100644
index fa7aad4c4d9..00000000000
--- a/keyboards/handwired/skakunm_dactyl/info.json
+++ /dev/null
@@ -1,76 +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": {
-        "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/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 e39bab4422a..00000000000
--- a/keyboards/handwired/skakunm_dactyl/rules.mk
+++ /dev/null
@@ -1,12 +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.
diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/info.json
deleted file mode 100644
index 95abaeb9c71..00000000000
--- a/keyboards/handwired/slash/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "keyboard_name": "Slash",
-    "manufacturer": "asdftemp",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "matrix_pins": {
-        "cols": ["D2", "F0", "F1", "F4", "F5", "F6", "F7", "D3"],
-        "rows": ["C7", "D6", "B7", "B6", "B5", "D7", "C6", "D0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [1, 0], "x": 2.75, "y": 0},
-                {"matrix": [0, 1], "x": 3.75, "y": 0},
-                {"matrix": [1, 1], "x": 4.75, "y": 0},
-                {"matrix": [0, 2], "x": 5.75, "y": 0},
-                {"matrix": [1, 2], "x": 6.75, "y": 0},
-                {"matrix": [0, 3], "x": 7.75, "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": 12.75, "y": 0},
-                {"matrix": [0, 6], "x": 13.75, "y": 0},
-                {"matrix": [1, 6], "x": 14.75, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 2.75, "y": 1},
-                {"matrix": [2, 1], "x": 3.75, "y": 1},
-                {"matrix": [3, 1], "x": 4.75, "y": 1},
-                {"matrix": [2, 2], "x": 5.75, "y": 1},
-                {"matrix": [3, 2], "x": 6.75, "y": 1},
-                {"matrix": [2, 3], "x": 7.75, "y": 1},
-                {"matrix": [3, 3], "x": 8.75, "y": 1},
-                {"matrix": [2, 4], "x": 9.75, "y": 1},
-                {"matrix": [3, 4], "x": 10.75, "y": 1},
-                {"matrix": [2, 5], "x": 11.75, "y": 1},
-                {"matrix": [3, 5], "x": 12.75, "y": 1},
-                {"matrix": [2, 6], "x": 13.75, "y": 1},
-                {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"matrix": [5, 0], "x": 1, "y": 2, "w": 1.75},
-                {"matrix": [4, 0], "x": 2.75, "y": 2},
-                {"matrix": [5, 1], "x": 3.75, "y": 2},
-                {"matrix": [4, 1], "x": 4.75, "y": 2},
-                {"matrix": [5, 2], "x": 5.75, "y": 2},
-                {"matrix": [4, 2], "x": 6.75, "y": 2},
-                {"matrix": [5, 3], "x": 7.75, "y": 2},
-                {"matrix": [4, 3], "x": 8.75, "y": 2},
-                {"matrix": [5, 4], "x": 9.75, "y": 2},
-                {"matrix": [4, 4], "x": 10.75, "y": 2},
-                {"matrix": [5, 5], "x": 11.75, "y": 2},
-                {"matrix": [4, 5], "x": 12.75, "y": 2},
-                {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 0.5, "y": 3, "w": 2.25},
-                {"matrix": [6, 0], "x": 2.75, "y": 3},
-                {"matrix": [7, 1], "x": 3.75, "y": 3},
-                {"matrix": [6, 1], "x": 4.75, "y": 3},
-                {"matrix": [7, 2], "x": 5.75, "y": 3},
-                {"matrix": [6, 2], "x": 6.75, "y": 3},
-                {"matrix": [7, 3], "x": 7.75, "y": 3},
-                {"matrix": [6, 3], "x": 8.75, "y": 3},
-                {"matrix": [7, 4], "x": 9.75, "y": 3},
-                {"matrix": [6, 4], "x": 10.75, "y": 3},
-                {"matrix": [7, 5], "x": 11.75, "y": 3},
-                {"matrix": [6, 5], "x": 12.75, "y": 3, "w": 2.75},
-
-                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [7, 7], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [3, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [2, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [6, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/slash/keyboard.json b/keyboards/handwired/slash/keyboard.json
new file mode 100644
index 00000000000..4fd99ebeee3
--- /dev/null
+++ b/keyboards/handwired/slash/keyboard.json
@@ -0,0 +1,98 @@
+{
+    "keyboard_name": "Slash",
+    "manufacturer": "asdftemp",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "matrix_pins": {
+        "cols": ["D2", "F0", "F1", "F4", "F5", "F6", "F7", "D3"],
+        "rows": ["C7", "D6", "B7", "B6", "B5", "D7", "C6", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "bluetooth": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [1, 0], "x": 2.75, "y": 0},
+                {"matrix": [0, 1], "x": 3.75, "y": 0},
+                {"matrix": [1, 1], "x": 4.75, "y": 0},
+                {"matrix": [0, 2], "x": 5.75, "y": 0},
+                {"matrix": [1, 2], "x": 6.75, "y": 0},
+                {"matrix": [0, 3], "x": 7.75, "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": 12.75, "y": 0},
+                {"matrix": [0, 6], "x": 13.75, "y": 0},
+                {"matrix": [1, 6], "x": 14.75, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 2.75, "y": 1},
+                {"matrix": [2, 1], "x": 3.75, "y": 1},
+                {"matrix": [3, 1], "x": 4.75, "y": 1},
+                {"matrix": [2, 2], "x": 5.75, "y": 1},
+                {"matrix": [3, 2], "x": 6.75, "y": 1},
+                {"matrix": [2, 3], "x": 7.75, "y": 1},
+                {"matrix": [3, 3], "x": 8.75, "y": 1},
+                {"matrix": [2, 4], "x": 9.75, "y": 1},
+                {"matrix": [3, 4], "x": 10.75, "y": 1},
+                {"matrix": [2, 5], "x": 11.75, "y": 1},
+                {"matrix": [3, 5], "x": 12.75, "y": 1},
+                {"matrix": [2, 6], "x": 13.75, "y": 1},
+                {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"matrix": [5, 0], "x": 1, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 1], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 2], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 3], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 4], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 5], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [6, 0], "x": 2.75, "y": 3},
+                {"matrix": [7, 1], "x": 3.75, "y": 3},
+                {"matrix": [6, 1], "x": 4.75, "y": 3},
+                {"matrix": [7, 2], "x": 5.75, "y": 3},
+                {"matrix": [6, 2], "x": 6.75, "y": 3},
+                {"matrix": [7, 3], "x": 7.75, "y": 3},
+                {"matrix": [6, 3], "x": 8.75, "y": 3},
+                {"matrix": [7, 4], "x": 9.75, "y": 3},
+                {"matrix": [6, 4], "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [6, 5], "x": 12.75, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [7, 7], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [3, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [2, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [6, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/slash/rules.mk b/keyboards/handwired/slash/rules.mk
index ca7f6f843fb..3437a35bdf1 100644
--- a/keyboards/handwired/slash/rules.mk
+++ b/keyboards/handwired/slash/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 = 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
diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json
deleted file mode 100644
index c106e4fd5ed..00000000000
--- a/keyboards/handwired/split65/promicro/info.json
+++ /dev/null
@@ -1,100 +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": {
-        "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/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 c20f156f45f..00000000000
--- a/keyboards/handwired/split65/promicro/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 = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json
deleted file mode 100644
index a9693b3a5b9..00000000000
--- a/keyboards/handwired/split65/stm32/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"],
-        "rows": ["B5", "B4", "B3", "B2", "B1"],
-        "io_delay": 5
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "A9"
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "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/stm32/keyboard.json b/keyboards/handwired/split65/stm32/keyboard.json
new file mode 100644
index 00000000000..d49339da021
--- /dev/null
+++ b/keyboards/handwired/split65/stm32/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "matrix_pins": {
+        "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"],
+        "rows": ["B5", "B4", "B3", "B2", "B1"],
+        "io_delay": 5
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "A9"
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "audio": true,
+        "oled": true
+    },
+    "board": "QMK_PROTON_C",
+    "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/stm32/rules.mk b/keyboards/handwired/split65/stm32/rules.mk
index 94186bf8c72..c6e29883213 100644
--- a/keyboards/handwired/split65/stm32/rules.mk
+++ b/keyboards/handwired/split65/stm32/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-OLED_ENABLE = yes
 SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/info.json
deleted file mode 100644
index 477f1f6612c..00000000000
--- a/keyboards/handwired/split89/info.json
+++ /dev/null
@@ -1,123 +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": {
-        "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/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 ab2c49da70e..00000000000
--- a/keyboards/handwired/split89/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 = 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/handwired/splittest/bluepill/keyboard.json b/keyboards/handwired/splittest/bluepill/keyboard.json
index 17b7f86a6f8..28e7d091f83 100644
--- a/keyboards/handwired/splittest/bluepill/keyboard.json
+++ b/keyboards/handwired/splittest/bluepill/keyboard.json
@@ -5,5 +5,11 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "STM32F103",
-    "bootloader": "stm32duino"
+    "bootloader": "stm32duino",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    }
 }
diff --git a/keyboards/handwired/splittest/promicro/keyboard.json b/keyboards/handwired/splittest/promicro/keyboard.json
index f3765207656..2f5929cc008 100644
--- a/keyboards/handwired/splittest/promicro/keyboard.json
+++ b/keyboards/handwired/splittest/promicro/keyboard.json
@@ -11,5 +11,11 @@
         "pin": "D3"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    }
 }
diff --git a/keyboards/handwired/splittest/rules.mk b/keyboards/handwired/splittest/rules.mk
index 8d00fcc579f..ae4d823b53e 100644
--- a/keyboards/handwired/splittest/rules.mk
+++ b/keyboards/handwired/splittest/rules.mk
@@ -1,13 +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 = 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
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = handwired/splittest/promicro
diff --git a/keyboards/handwired/splittest/teensy_2/keyboard.json b/keyboards/handwired/splittest/teensy_2/keyboard.json
index 72e9d022b94..68ab3f92c4e 100644
--- a/keyboards/handwired/splittest/teensy_2/keyboard.json
+++ b/keyboards/handwired/splittest/teensy_2/keyboard.json
@@ -11,5 +11,11 @@
         "pin": "D3"
     },
     "processor": "atmega32u4",
-    "bootloader": "halfkay"
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    }
 }
diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/info.json
deleted file mode 100644
index 92098b09c64..00000000000
--- a/keyboards/handwired/trackpoint/info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "keyboard_name": "Trackpoint Demo",
-    "manufacturer": "QMK",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x1234",
-        "pid": "0x5678",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F4", "F5"],
-        "rows": ["F0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "halfkay",
-    "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/handwired/trackpoint/keyboard.json b/keyboards/handwired/trackpoint/keyboard.json
new file mode 100644
index 00000000000..94ed022878f
--- /dev/null
+++ b/keyboards/handwired/trackpoint/keyboard.json
@@ -0,0 +1,36 @@
+{
+    "keyboard_name": "Trackpoint Demo",
+    "manufacturer": "QMK",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x1234",
+        "pid": "0x5678",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5"],
+        "rows": ["F0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "ps2": true,
+        "ps2_mouse": 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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/trackpoint/rules.mk b/keyboards/handwired/trackpoint/rules.mk
index ca3836ef06b..74035c9903b 100644
--- a/keyboards/handwired/trackpoint/rules.mk
+++ b/keyboards/handwired/trackpoint/rules.mk
@@ -1,15 +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 = 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
-
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
 PS2_DRIVER = usart
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
deleted file mode 100644
index aa01e763eb4..00000000000
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "keyboard_name": "Tractyl Manuform (4x6)",
-    "url": "",
-    "maintainer": "drashna",
-    "usb": {
-        "pid": "0x3537",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 80,
-        "sleep": true,
-        "split_count": [32, 30]
-    },
-    "matrix_pins": {
-        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
-        "rows": ["A0", "A1", "A2", "A3", "A4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D3",
-        "bootmagic": {
-            "matrix": [4, 5]
-        }
-    },
-    "ws2812": {
-        "pin": "E7"
-    },
-    "processor": "at90usb1286",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_4x6_right": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "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, 1], "x": 12, "y": 4},
-
-                {"matrix": [4, 4], "x": 6, "y": 5},
-                {"matrix": [4, 5], "x": 7, "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/tractyl_manuform/4x6_right/keyboard.json b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
new file mode 100644
index 00000000000..825c59ac725
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Tractyl Manuform (4x6)",
+    "url": "",
+    "maintainer": "drashna",
+    "usb": {
+        "pid": "0x3537",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 80,
+        "sleep": true,
+        "split_count": [32, 30]
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
+        "rows": ["A0", "A1", "A2", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3",
+        "bootmagic": {
+            "matrix": [4, 5]
+        }
+    },
+    "ws2812": {
+        "pin": "E7"
+    },
+    "processor": "at90usb1286",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "pointing_device": true
+    },
+    "layouts": {
+        "LAYOUT_4x6_right": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "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, 1], "x": 12, "y": 4},
+
+                {"matrix": [4, 4], "x": 6, "y": 5},
+                {"matrix": [4, 5], "x": 7, "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/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
index 0b23bdc61ff..0f3d0657aa4 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
@@ -1,17 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = no
-
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = yes
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
deleted file mode 100644
index 92e0baace1f..00000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "Tractyl Manuform (5x6) Elite-C",
-    "matrix_pins": {
-        "cols": ["D4", "D7", "E6", "B4", "B5", "B7"],
-        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D5", "pin_b": "C7"}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "led_count": 20,
-        "max_brightness": 80,
-        "split_count": [10, 10]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json
new file mode 100644
index 00000000000..e6c0e42bde9
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json
@@ -0,0 +1,29 @@
+{
+    "keyboard_name": "Tractyl Manuform (5x6) Elite-C",
+    "matrix_pins": {
+        "cols": ["D4", "D7", "E6", "B4", "B5", "B7"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D5", "pin_b": "C7"}
+        ]
+    },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "led_count": 20,
+        "max_brightness": 80,
+        "split_count": [10, 10]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    }
+}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk
deleted file mode 100644
index 16c76d7f49b..00000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LTO_ENABLE := yes
-RGBLIGHT_ENABLE = no
-OLED_ENABLE = no
-AUDIO_ENABLE = no
-ENCODER_ENABLE = no
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
deleted file mode 100644
index eafb77fce2b..00000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "Tractyl Manuform (5x6) Proton-C",
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
-        "rows": ["B10", "B11", "B12", "A14", "A13", "A15"]
-    },
-    "diode_direction": "COL2ROW",
-    "eeprom": {
-        "driver": "spi"
-    },
-    "rgblight": {
-        "led_count": 20,
-        "split_count": [10, 10]
-    },
-    "ws2812": {
-        "pin": "A6",
-        "driver": "pwm"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A7", "pin_b": "A8"}
-        ]
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
new file mode 100644
index 00000000000..0bcc02fd743
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
@@ -0,0 +1,29 @@
+{
+    "keyboard_name": "Tractyl Manuform (5x6) Proton-C",
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
+        "rows": ["B10", "B11", "B12", "A14", "A13", "A15"]
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "spi"
+    },
+    "rgblight": {
+        "led_count": 20,
+        "split_count": [10, 10]
+    },
+    "ws2812": {
+        "pin": "A6",
+        "driver": "pwm"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A7", "pin_b": "A8"}
+        ]
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "console": true
+    }
+}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
index ab601e31f9a..23f790a1ad4 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
@@ -1,5 +1,4 @@
 # KEYBOARD_SHARED_EP = yes
-CONSOLE_ENABLE     = yes
 
 SERIAL_DRIVER = usart
 AUDIO_DRIVER  = dac_additive
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
deleted file mode 100644
index e5a6dc6c7a2..00000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "keyboard_name": "Tractyl Manuform (5x6) BlackPill",
-    "matrix_pins": {
-        "cols": ["A15", "B3", "B4", "B5", "B6", "B7"],
-        "rows": ["B12", "B13", "B14", "B15", "A8", "A10"]
-    },
-    "diode_direction": "COL2ROW",
-    "eeprom": {
-        "driver": "spi"
-    },
-    "rgblight": {
-        "led_count": 57,
-        "split_count": [26, 31]
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "ws2812": {
-        "pin": "A1",
-        "driver": "pwm"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A13", "pin_b": "A14"}
-        ]
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
new file mode 100644
index 00000000000..3821f0380f2
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
@@ -0,0 +1,33 @@
+{
+    "keyboard_name": "Tractyl Manuform (5x6) BlackPill",
+    "matrix_pins": {
+        "cols": ["A15", "B3", "B4", "B5", "B6", "B7"],
+        "rows": ["B12", "B13", "B14", "B15", "A8", "A10"]
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "spi"
+    },
+    "rgblight": {
+        "led_count": 57,
+        "split_count": [26, 31]
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A13", "pin_b": "A14"}
+        ]
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "console": true
+    },
+    "board": "BLACKPILL_STM32_F411"
+}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
index 0c4b05ee7e2..e75692030f7 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
@@ -1,5 +1,4 @@
 KEYBOARD_SHARED_EP = yes
-CONSOLE_ENABLE     = yes
 MOUSE_SHARED_EP    = yes
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index c9fe6e89cff..b28f309fdbb 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -10,6 +10,14 @@
             "matrix": [6, 5]
         }
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "swap_hands": true,
+        "pointing_device": true
+    },
     "layouts": {
         "LAYOUT_5x6_right": {
             "layout": [
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
index 220a361a4cc..b7f7c949ec4 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SWAP_HANDS_ENABLE = yes
-
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = yes
 
diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json
deleted file mode 100644
index afd79a9bcc6..00000000000
--- a/keyboards/handwired/twadlee/tp69/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "keyboard_name": "TP69",
-    "manufacturer": "Tracy Wadleigh",
-    "url": "https://github.com/twadleigh/qmk_firmware",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xBEEF",
-        "pid": "0xCACA",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D6", "A4", "B16", "B17", "A1", "A2", "D7"],
-        "rows": ["B2", "B1", "B0", "C0", "D1", "D0", "D3", "D4", "D2", "C3"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "MKL26Z64",
-    "bootloader": "halfkay",
-    "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": [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, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [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, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "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.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": [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, 5], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.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},
-                {"matrix": [4, 6], "x": 5.75, "y": 4},
-                {"matrix": [4, 7], "x": 6.75, "y": 4},
-                {"matrix": [9, 1], "x": 7.75, "y": 4},
-                {"matrix": [9, 2], "x": 8.75, "y": 4, "w": 2.25},
-                {"matrix": [9, 4], "x": 11, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 7], "x": 14.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/twadlee/tp69/keyboard.json b/keyboards/handwired/twadlee/tp69/keyboard.json
new file mode 100644
index 00000000000..27e0325f92d
--- /dev/null
+++ b/keyboards/handwired/twadlee/tp69/keyboard.json
@@ -0,0 +1,104 @@
+{
+    "keyboard_name": "TP69",
+    "manufacturer": "Tracy Wadleigh",
+    "url": "https://github.com/twadleigh/qmk_firmware",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xBEEF",
+        "pid": "0xCACA",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D6", "A4", "B16", "B17", "A1", "A2", "D7"],
+        "rows": ["B2", "B1", "B0", "C0", "D1", "D0", "D3", "D4", "D2", "C3"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "MKL26Z64",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": 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": [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, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [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, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "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.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": [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, 5], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.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},
+                {"matrix": [4, 6], "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "x": 6.75, "y": 4},
+                {"matrix": [9, 1], "x": 7.75, "y": 4},
+                {"matrix": [9, 2], "x": 8.75, "y": 4, "w": 2.25},
+                {"matrix": [9, 4], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 14.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/twadlee/tp69/rules.mk b/keyboards/handwired/twadlee/tp69/rules.mk
index b73afc0e44a..43b04f34f77 100644
--- a/keyboards/handwired/twadlee/tp69/rules.mk
+++ b/keyboards/handwired/twadlee/tp69/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 = 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
-PS2_MOUSE_ENABLE = no
-
 USE_CHIBIOS_CONTRIB = yes
-
diff --git a/keyboards/handwired/unk/rev1/keyboard.json b/keyboards/handwired/unk/rev1/keyboard.json
index fc1cfc90b72..acaca15f3b3 100644
--- a/keyboards/handwired/unk/rev1/keyboard.json
+++ b/keyboards/handwired/unk/rev1/keyboard.json
@@ -31,6 +31,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/unk/rules.mk b/keyboards/handwired/unk/rules.mk
index a03f28dbf5f..d4536e0cbb6 100644
--- a/keyboards/handwired/unk/rules.mk
+++ b/keyboards/handwired/unk/rules.mk
@@ -1,14 +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
-
 DEFAULT_FOLDER = handwired/unk/rev1
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
deleted file mode 100644
index dbbce9139dc..00000000000
--- a/keyboards/handwired/uthol/rev3/info.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "keyboard_name": "UtholThree",
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "rgblight": {
-        "led_count": 39,
-        "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": {
-            "hue": 201
-        }
-    },
-    "tapping": {
-        "term": 500
-    },
-    "ws2812": {
-        "pin": "B0"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"],
-        "rows": ["A4", "A3", "A2", "A1", "A0"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
-        ]
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/uthol/rev3/keyboard.json b/keyboards/handwired/uthol/rev3/keyboard.json
new file mode 100644
index 00000000000..9b1a476b87c
--- /dev/null
+++ b/keyboards/handwired/uthol/rev3/keyboard.json
@@ -0,0 +1,55 @@
+{
+    "keyboard_name": "UtholThree",
+    "usb": {
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "rgblight": {
+        "led_count": 39,
+        "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": {
+            "hue": 201
+        }
+    },
+    "tapping": {
+        "term": 500
+    },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
+        ]
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "nkro": true,
+        "oled": true,
+        "wpm": true,
+        "extrakey": true,
+        "encoder": true,
+        "rgblight": true
+    },
+    "board": "BLACKPILL_STM32_F401"
+}
diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk
deleted file mode 100644
index 1577cf8a775..00000000000
--- a/keyboards/handwired/uthol/rev3/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes
-NKRO_ENABLE = yes
-KEYBOARD_SHARED_EP = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-ENCODER_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/info.json
deleted file mode 100644
index 9bb1d9cd940..00000000000
--- a/keyboards/handwired/wulkan/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "keyboard_name": "Handwired48Keys",
-    "manufacturer": "Wulkan",
-    "url": "",
-    "maintainer": "Napoleon Wulkan",
-    "usb": {
-      "vid": "0xFEED",
-      "pid": "0x6060",
-      "device_version": "0.0.1",
-      "force_nkro": true
-    },
-    "matrix_pins": {
-      "cols": ["B13", "B14", "B15", "B9", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],
-      "rows": ["B8", "A0", "A1", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "community_layouts": ["ortho_4x12"],
-    "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, "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/handwired/wulkan/keyboard.json b/keyboards/handwired/wulkan/keyboard.json
new file mode 100644
index 00000000000..b6823af5396
--- /dev/null
+++ b/keyboards/handwired/wulkan/keyboard.json
@@ -0,0 +1,87 @@
+{
+    "keyboard_name": "Handwired48Keys",
+    "manufacturer": "Wulkan",
+    "url": "",
+    "maintainer": "Napoleon Wulkan",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x6060",
+      "device_version": "0.0.1",
+      "force_nkro": true
+    },
+    "matrix_pins": {
+      "cols": ["B13", "B14", "B15", "B9", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],
+      "rows": ["B8", "A0", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "board": "QMK_PROTON_C",
+    "community_layouts": ["ortho_4x12"],
+    "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, "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/handwired/wulkan/rules.mk b/keyboards/handwired/wulkan/rules.mk
index e664c345408..934dd273a65 100644
--- a/keyboards/handwired/wulkan/rules.mk
+++ b/keyboards/handwired/wulkan/rules.mk
@@ -1,13 +1 @@
-# 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
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
 NO_SUSPEND_POWER_DOWN = yes
diff --git a/keyboards/handwired/xealous/rev1/keyboard.json b/keyboards/handwired/xealous/rev1/keyboard.json
index 001cd82074c..9f926a36021 100644
--- a/keyboards/handwired/xealous/rev1/keyboard.json
+++ b/keyboards/handwired/xealous/rev1/keyboard.json
@@ -22,6 +22,15 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true,
+    "audio": true
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk
index aa77674920d..4a97d066df7 100644
--- a/keyboards/handwired/xealous/rules.mk
+++ b/keyboards/handwired/xealous/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 = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes          # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 SRC += matrix.c
 
 DEFAULT_FOLDER = handwired/xealous/rev1
diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/info.json
deleted file mode 100644
index 6fa33228df8..00000000000
--- a/keyboards/hardwareabstraction/handwire/info.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "manufacturer": "Hardware Abstraction",
-    "keyboard_name": "handwire",
-    "maintainer": "cgmandy",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B0", "B7", "D5", "D3", "D2"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://github.com/cgmandy",
-    "usb": {
-        "device_version": "1.0.0",
-        "vid": "0xAF01",
-        "pid": "0x0001"
-    },
-    "layouts": {
-        "LAYOUT_60_arrows": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "w": 2, "x": 13, "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, 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], "w": 1.75, "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-                {"matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
-                {"matrix": [4, 8], "x": 10, "y": 4},
-                {"matrix": [4, 9], "x": 11, "y": 4},
-                {"matrix": [4, 10], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hardwareabstraction/handwire/keyboard.json b/keyboards/hardwareabstraction/handwire/keyboard.json
new file mode 100644
index 00000000000..5e0ec6f11e2
--- /dev/null
+++ b/keyboards/hardwareabstraction/handwire/keyboard.json
@@ -0,0 +1,105 @@
+{
+    "manufacturer": "Hardware Abstraction",
+    "keyboard_name": "handwire",
+    "maintainer": "cgmandy",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "haptic": true,
+        "oled": true,
+        "wpm": true
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B7", "D5", "D3", "D2"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://github.com/cgmandy",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xAF01",
+        "pid": "0x0001"
+    },
+    "layouts": {
+        "LAYOUT_60_arrows": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "w": 2, "x": 13, "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, 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], "w": 1.75, "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hardwareabstraction/handwire/rules.mk b/keyboards/hardwareabstraction/handwire/rules.mk
index 8a33a553313..a521203b326 100644
--- a/keyboards/hardwareabstraction/handwire/rules.mk
+++ b/keyboards/hardwareabstraction/handwire/rules.mk
@@ -1,7 +1 @@
-LTO_ENABLE = yes
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
-
-OLED_ENABLE = yes
-
-WPM_ENABLE = yes
diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/info.json
deleted file mode 100644
index 070a69f6917..00000000000
--- a/keyboards/hazel/bad_wings/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "keyboard_name": "Bad Wings",
-  "manufacturer": "Hazel",
-  "maintainer": "jasonhazel",
-  "url": "https://shop.hazel.cc/products/bad-wings",
-  "usb": {
-    "vid": "0x4A48",
-    "pid": "0x4257",
-    "device_version": "1.0.0"
-  },
-  "processor": "RP2040",
-  "bootloader": "rp2040",
-  "matrix_size": {
-    "cols": 8,
-    "rows": 5
-  },
-  "diode_direction": "COL2ROW",
-  "features": {
-    "bootmagic": true,
-    "deferred_exec": true,
-    "nkro": false
-  },
-  "community_layouts": ["split_3x5_3"],
-  "layouts": {
-    "LAYOUT_split_3x5_3": {
-      "layout": [
-        {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0.75},
-        {"label": "K10", "matrix": [1, 0], "x": 1, "y": 0.5},
-        {"label": "K20", "matrix": [2, 0], "x": 2, "y": 0},
-        {"label": "K30", "matrix": [3, 0], "x": 3, "y": 0.25},
-        {"label": "K40", "matrix": [4, 0], "x": 4, "y": 0.36},
-        {"label": "K44", "matrix": [4, 4], "x": 8, "y": 0.36},
-        {"label": "K34", "matrix": [3, 4], "x": 9, "y": 0.25},
-        {"label": "K24", "matrix": [2, 4], "x": 10, "y": 0},
-        {"label": "K14", "matrix": [1, 4], "x": 11, "y": 0.5},
-        {"label": "K04", "matrix": [0, 4], "x": 12, "y": 0.75},
-        {"label": "K01", "matrix": [0, 1], "x": 0, "y": 1.75},
-        {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1.5},
-        {"label": "K21", "matrix": [2, 1], "x": 2, "y": 1},
-        {"label": "K31", "matrix": [3, 1], "x": 3, "y": 1.25},
-        {"label": "K41", "matrix": [4, 1], "x": 4, "y": 1.36},
-        {"label": "K45", "matrix": [4, 5], "x": 8, "y": 1.36},
-        {"label": "K35", "matrix": [3, 5], "x": 9, "y": 1.25},
-        {"label": "K25", "matrix": [2, 5], "x": 10, "y": 1},
-        {"label": "K15", "matrix": [1, 5], "x": 11, "y": 1.5},
-        {"label": "K05", "matrix": [0, 5], "x": 12, "y": 1.75},
-        {"label": "K02", "matrix": [0, 2], "x": 0, "y": 2.75},
-        {"label": "K12", "matrix": [1, 2], "x": 1, "y": 2.5},
-        {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2},
-        {"label": "K32", "matrix": [3, 2], "x": 3, "y": 2.25},
-        {"label": "K42", "matrix": [4, 2], "x": 4, "y": 2.36},
-        {"label": "K46", "matrix": [4, 6], "x": 8, "y": 2.36},
-        {"label": "K36", "matrix": [3, 6], "x": 9, "y": 2.25},
-        {"label": "K26", "matrix": [2, 6], "x": 10, "y": 2},
-        {"label": "K16", "matrix": [1, 6], "x": 11, "y": 2.5},
-        {"label": "K06", "matrix": [0, 6], "x": 12, "y": 2.75},
-        {"label": "K23", "matrix": [2, 3], "x": 3, "y": 3.25},
-        {"label": "K33", "matrix": [3, 3], "x": 4, "y": 3.36},
-        {"label": "K43", "matrix": [4, 3], "x": 5, "y": 3.47},
-        {"label": "K47", "matrix": [4, 7], "x": 7, "y": 3.47},
-        {"label": "K37", "matrix": [3, 7], "x": 8, "y": 3.36},
-        {"label": "K27", "matrix": [2, 7], "x": 9, "y": 3.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hazel/bad_wings/keyboard.json b/keyboards/hazel/bad_wings/keyboard.json
new file mode 100644
index 00000000000..fef514c539f
--- /dev/null
+++ b/keyboards/hazel/bad_wings/keyboard.json
@@ -0,0 +1,69 @@
+{
+  "keyboard_name": "Bad Wings",
+  "manufacturer": "Hazel",
+  "maintainer": "jasonhazel",
+  "url": "https://shop.hazel.cc/products/bad-wings",
+  "usb": {
+    "vid": "0x4A48",
+    "pid": "0x4257",
+    "device_version": "1.0.0"
+  },
+  "processor": "RP2040",
+  "bootloader": "rp2040",
+  "matrix_size": {
+    "cols": 8,
+    "rows": 5
+  },
+  "diode_direction": "COL2ROW",
+  "features": {
+    "bootmagic": true,
+    "deferred_exec": true,
+    "nkro": false,
+    "pointing_device": true,
+    "tri_layer": true,
+    "caps_word": true
+  },
+  "community_layouts": ["split_3x5_3"],
+  "layouts": {
+    "LAYOUT_split_3x5_3": {
+      "layout": [
+        {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0.75},
+        {"label": "K10", "matrix": [1, 0], "x": 1, "y": 0.5},
+        {"label": "K20", "matrix": [2, 0], "x": 2, "y": 0},
+        {"label": "K30", "matrix": [3, 0], "x": 3, "y": 0.25},
+        {"label": "K40", "matrix": [4, 0], "x": 4, "y": 0.36},
+        {"label": "K44", "matrix": [4, 4], "x": 8, "y": 0.36},
+        {"label": "K34", "matrix": [3, 4], "x": 9, "y": 0.25},
+        {"label": "K24", "matrix": [2, 4], "x": 10, "y": 0},
+        {"label": "K14", "matrix": [1, 4], "x": 11, "y": 0.5},
+        {"label": "K04", "matrix": [0, 4], "x": 12, "y": 0.75},
+        {"label": "K01", "matrix": [0, 1], "x": 0, "y": 1.75},
+        {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1.5},
+        {"label": "K21", "matrix": [2, 1], "x": 2, "y": 1},
+        {"label": "K31", "matrix": [3, 1], "x": 3, "y": 1.25},
+        {"label": "K41", "matrix": [4, 1], "x": 4, "y": 1.36},
+        {"label": "K45", "matrix": [4, 5], "x": 8, "y": 1.36},
+        {"label": "K35", "matrix": [3, 5], "x": 9, "y": 1.25},
+        {"label": "K25", "matrix": [2, 5], "x": 10, "y": 1},
+        {"label": "K15", "matrix": [1, 5], "x": 11, "y": 1.5},
+        {"label": "K05", "matrix": [0, 5], "x": 12, "y": 1.75},
+        {"label": "K02", "matrix": [0, 2], "x": 0, "y": 2.75},
+        {"label": "K12", "matrix": [1, 2], "x": 1, "y": 2.5},
+        {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2},
+        {"label": "K32", "matrix": [3, 2], "x": 3, "y": 2.25},
+        {"label": "K42", "matrix": [4, 2], "x": 4, "y": 2.36},
+        {"label": "K46", "matrix": [4, 6], "x": 8, "y": 2.36},
+        {"label": "K36", "matrix": [3, 6], "x": 9, "y": 2.25},
+        {"label": "K26", "matrix": [2, 6], "x": 10, "y": 2},
+        {"label": "K16", "matrix": [1, 6], "x": 11, "y": 2.5},
+        {"label": "K06", "matrix": [0, 6], "x": 12, "y": 2.75},
+        {"label": "K23", "matrix": [2, 3], "x": 3, "y": 3.25},
+        {"label": "K33", "matrix": [3, 3], "x": 4, "y": 3.36},
+        {"label": "K43", "matrix": [4, 3], "x": 5, "y": 3.47},
+        {"label": "K47", "matrix": [4, 7], "x": 7, "y": 3.47},
+        {"label": "K37", "matrix": [3, 7], "x": 8, "y": 3.36},
+        {"label": "K27", "matrix": [2, 7], "x": 9, "y": 3.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hazel/bad_wings/rules.mk b/keyboards/hazel/bad_wings/rules.mk
index 47a188155fe..a49017527d7 100644
--- a/keyboards/hazel/bad_wings/rules.mk
+++ b/keyboards/hazel/bad_wings/rules.mk
@@ -1,10 +1,6 @@
-TRI_LAYER_ENABLE = yes
-CAPS_WORD_ENABLE = yes
-
 SRC += matrix.c
 
 SPI_DRIVER_REQUIRED = yes
 CUSTOM_MATRIX = lite
 
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
-POINTING_DEVICE_ENABLE  = yes
diff --git a/keyboards/hhkb/ansi/32u2/info.json b/keyboards/hhkb/ansi/32u2/keyboard.json
similarity index 100%
rename from keyboards/hhkb/ansi/32u2/info.json
rename to keyboards/hhkb/ansi/32u2/keyboard.json
diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json
deleted file mode 100644
index 589cf98dde4..00000000000
--- a/keyboards/hhkb/jp/info.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "keyboard_name": "JP",
-  "manufacturer": "HHKB",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4848",
-    "pid": "0x0002",
-    "device_version": "1.0.4"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_jp": {
-      "layout": [
-        {"matrix": [0, 2], "x": 0, "y": 0},
-        {"matrix": [3, 2], "x": 1, "y": 0},
-        {"matrix": [6, 2], "x": 2, "y": 0},
-        {"matrix": [2, 2], "x": 3, "y": 0},
-        {"matrix": [1, 2], "x": 4, "y": 0},
-        {"matrix": [5, 2], "x": 5, "y": 0},
-        {"matrix": [7, 2], "x": 6, "y": 0},
-        {"matrix": [10, 2], "x": 7, "y": 0},
-        {"matrix": [9, 2], "x": 8, "y": 0},
-        {"matrix": [8, 2], "x": 9, "y": 0},
-        {"matrix": [11, 2], "x": 10, "y": 0},
-        {"matrix": [14, 2], "x": 11, "y": 0},
-        {"matrix": [15, 2], "x": 12, "y": 0},
-        {"matrix": [13, 2], "x": 13, "y": 0},
-        {"matrix": [12, 2], "x": 14, "y": 0},
-
-        {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [6, 3], "x": 1.5, "y": 1},
-        {"matrix": [2, 3], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [5, 3], "x": 4.5, "y": 1},
-        {"matrix": [7, 3], "x": 5.5, "y": 1},
-        {"matrix": [10, 3], "x": 6.5, "y": 1},
-        {"matrix": [9, 3], "x": 7.5, "y": 1},
-        {"matrix": [8, 3], "x": 8.5, "y": 1},
-        {"matrix": [11, 3], "x": 9.5, "y": 1},
-        {"matrix": [14, 3], "x": 10.5, "y": 1},
-        {"matrix": [15, 3], "x": 11.5, "y": 1},
-        {"matrix": [13, 3], "x": 12.5, "y": 1},
-        {"matrix": [0, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-        {"matrix": [6, 6], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 6], "x": 1.75, "y": 2},
-        {"matrix": [1, 6], "x": 2.75, "y": 2},
-        {"matrix": [5, 6], "x": 3.75, "y": 2},
-        {"matrix": [7, 6], "x": 4.75, "y": 2},
-        {"matrix": [10, 6], "x": 5.75, "y": 2},
-        {"matrix": [9, 6], "x": 6.75, "y": 2},
-        {"matrix": [8, 6], "x": 7.75, "y": 2},
-        {"matrix": [11, 6], "x": 8.75, "y": 2},
-        {"matrix": [14, 6], "x": 9.75, "y": 2},
-        {"matrix": [15, 6], "x": 10.75, "y": 2},
-        {"matrix": [13, 6], "x": 11.75, "y": 2},
-        {"matrix": [12, 6], "x": 12.75, "y": 2},
-
-        {"matrix": [0, 5], "x": 0, "y": 3, "w": 2},
-        {"matrix": [6, 5], "x": 2, "y": 3},
-        {"matrix": [2, 5], "x": 3, "y": 3},
-        {"matrix": [1, 5], "x": 4, "y": 3},
-        {"matrix": [5, 5], "x": 5, "y": 3},
-        {"matrix": [7, 5], "x": 6, "y": 3},
-        {"matrix": [10, 5], "x": 7, "y": 3},
-        {"matrix": [9, 5], "x": 8, "y": 3},
-        {"matrix": [8, 5], "x": 9, "y": 3},
-        {"matrix": [11, 5], "x": 10, "y": 3},
-        {"matrix": [14, 5], "x": 11, "y": 3},
-        {"matrix": [15, 5], "x": 12, "y": 3},
-        {"matrix": [13, 5], "x": 13, "y": 3},
-        {"matrix": [12, 5], "x": 14, "y": 3},
-
-        {"matrix": [0, 4], "x": 0, "y": 4},
-
-        {"matrix": [3, 4], "x": 1.25, "y": 4},
-        {"matrix": [6, 4], "x": 2.25, "y": 4},
-        {"matrix": [2, 4], "x": 3.25, "y": 4},
-        {"matrix": [1, 4], "x": 4.25, "y": 4},
-        {"matrix": [7, 4], "x": 5.25, "y": 4, "w": 2.5},
-        {"matrix": [9, 4], "x": 7.75, "y": 4},
-        {"matrix": [8, 4], "x": 8.75, "y": 4},
-        {"matrix": [11, 4], "x": 9.75, "y": 4},
-        {"matrix": [14, 4], "x": 10.75, "y": 4},
-
-        {"matrix": [15, 4], "x": 12, "y": 4},
-        {"matrix": [13, 4], "x": 13, "y": 4},
-        {"matrix": [12, 4], "x": 14, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hhkb/jp/keyboard.json b/keyboards/hhkb/jp/keyboard.json
new file mode 100644
index 00000000000..d745f21d20b
--- /dev/null
+++ b/keyboards/hhkb/jp/keyboard.json
@@ -0,0 +1,101 @@
+{
+  "keyboard_name": "JP",
+  "manufacturer": "HHKB",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4848",
+    "pid": "0x0002",
+    "device_version": "1.0.4"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true
+  },
+  "layouts": {
+    "LAYOUT_jp": {
+      "layout": [
+        {"matrix": [0, 2], "x": 0, "y": 0},
+        {"matrix": [3, 2], "x": 1, "y": 0},
+        {"matrix": [6, 2], "x": 2, "y": 0},
+        {"matrix": [2, 2], "x": 3, "y": 0},
+        {"matrix": [1, 2], "x": 4, "y": 0},
+        {"matrix": [5, 2], "x": 5, "y": 0},
+        {"matrix": [7, 2], "x": 6, "y": 0},
+        {"matrix": [10, 2], "x": 7, "y": 0},
+        {"matrix": [9, 2], "x": 8, "y": 0},
+        {"matrix": [8, 2], "x": 9, "y": 0},
+        {"matrix": [11, 2], "x": 10, "y": 0},
+        {"matrix": [14, 2], "x": 11, "y": 0},
+        {"matrix": [15, 2], "x": 12, "y": 0},
+        {"matrix": [13, 2], "x": 13, "y": 0},
+        {"matrix": [12, 2], "x": 14, "y": 0},
+
+        {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [6, 3], "x": 1.5, "y": 1},
+        {"matrix": [2, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [5, 3], "x": 4.5, "y": 1},
+        {"matrix": [7, 3], "x": 5.5, "y": 1},
+        {"matrix": [10, 3], "x": 6.5, "y": 1},
+        {"matrix": [9, 3], "x": 7.5, "y": 1},
+        {"matrix": [8, 3], "x": 8.5, "y": 1},
+        {"matrix": [11, 3], "x": 9.5, "y": 1},
+        {"matrix": [14, 3], "x": 10.5, "y": 1},
+        {"matrix": [15, 3], "x": 11.5, "y": 1},
+        {"matrix": [13, 3], "x": 12.5, "y": 1},
+        {"matrix": [0, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+        {"matrix": [6, 6], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 6], "x": 1.75, "y": 2},
+        {"matrix": [1, 6], "x": 2.75, "y": 2},
+        {"matrix": [5, 6], "x": 3.75, "y": 2},
+        {"matrix": [7, 6], "x": 4.75, "y": 2},
+        {"matrix": [10, 6], "x": 5.75, "y": 2},
+        {"matrix": [9, 6], "x": 6.75, "y": 2},
+        {"matrix": [8, 6], "x": 7.75, "y": 2},
+        {"matrix": [11, 6], "x": 8.75, "y": 2},
+        {"matrix": [14, 6], "x": 9.75, "y": 2},
+        {"matrix": [15, 6], "x": 10.75, "y": 2},
+        {"matrix": [13, 6], "x": 11.75, "y": 2},
+        {"matrix": [12, 6], "x": 12.75, "y": 2},
+
+        {"matrix": [0, 5], "x": 0, "y": 3, "w": 2},
+        {"matrix": [6, 5], "x": 2, "y": 3},
+        {"matrix": [2, 5], "x": 3, "y": 3},
+        {"matrix": [1, 5], "x": 4, "y": 3},
+        {"matrix": [5, 5], "x": 5, "y": 3},
+        {"matrix": [7, 5], "x": 6, "y": 3},
+        {"matrix": [10, 5], "x": 7, "y": 3},
+        {"matrix": [9, 5], "x": 8, "y": 3},
+        {"matrix": [8, 5], "x": 9, "y": 3},
+        {"matrix": [11, 5], "x": 10, "y": 3},
+        {"matrix": [14, 5], "x": 11, "y": 3},
+        {"matrix": [15, 5], "x": 12, "y": 3},
+        {"matrix": [13, 5], "x": 13, "y": 3},
+        {"matrix": [12, 5], "x": 14, "y": 3},
+
+        {"matrix": [0, 4], "x": 0, "y": 4},
+
+        {"matrix": [3, 4], "x": 1.25, "y": 4},
+        {"matrix": [6, 4], "x": 2.25, "y": 4},
+        {"matrix": [2, 4], "x": 3.25, "y": 4},
+        {"matrix": [1, 4], "x": 4.25, "y": 4},
+        {"matrix": [7, 4], "x": 5.25, "y": 4, "w": 2.5},
+        {"matrix": [9, 4], "x": 7.75, "y": 4},
+        {"matrix": [8, 4], "x": 8.75, "y": 4},
+        {"matrix": [11, 4], "x": 9.75, "y": 4},
+        {"matrix": [14, 4], "x": 10.75, "y": 4},
+
+        {"matrix": [15, 4], "x": 12, "y": 4},
+        {"matrix": [13, 4], "x": 13, "y": 4},
+        {"matrix": [12, 4], "x": 14, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk
index 5c659643418..9e74e1cfb9a 100644
--- a/keyboards/hhkb/jp/rules.mk
+++ b/keyboards/hhkb/jp/rules.mk
@@ -1,14 +1,7 @@
 # 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 for the HHKB
-NKRO_ENABLE = no            # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # project specific files
 SRC = matrix.c
diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json
deleted file mode 100644
index 24cd750e09c..00000000000
--- a/keyboards/hhkb/yang/info.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "keyboard_name": "HHKB BLE",
-  "manufacturer": "YANG",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4848",
-    "pid": "0x0001",
-    "device_version": "1.0.4"
-  },
-  "indicators": {
-    "caps_lock": "F4"
-  },
-  "bluetooth": {
-    "driver": "bluefruit_le"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "lufa-ms",
-  "debounce": 0,
-  "community_layouts": ["60_hhkb"],
-  "layouts": {
-    "LAYOUT_60_hhkb": {
-      "layout": [
-        {"matrix": [3, 1], "x": 0, "y": 0},
-        {"matrix": [3, 0], "x": 1, "y": 0},
-        {"matrix": [0, 0], "x": 2, "y": 0},
-        {"matrix": [1, 0], "x": 3, "y": 0},
-        {"matrix": [1, 1], "x": 4, "y": 0},
-        {"matrix": [2, 0], "x": 5, "y": 0},
-        {"matrix": [2, 1], "x": 6, "y": 0},
-        {"matrix": [4, 0], "x": 7, "y": 0},
-        {"matrix": [4, 1], "x": 8, "y": 0},
-        {"matrix": [6, 0], "x": 9, "y": 0},
-        {"matrix": [6, 1], "x": 10, "y": 0},
-        {"matrix": [7, 0], "x": 11, "y": 0},
-        {"matrix": [7, 1], "x": 12, "y": 0},
-        {"matrix": [5, 0], "x": 13, "y": 0},
-        {"matrix": [5, 1], "x": 14, "y": 0},
-
-        {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [0, 1], "x": 1.5, "y": 1},
-        {"matrix": [0, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 2], "x": 4.5, "y": 1},
-        {"matrix": [2, 3], "x": 5.5, "y": 1},
-        {"matrix": [2, 2], "x": 6.5, "y": 1},
-        {"matrix": [4, 2], "x": 7.5, "y": 1},
-        {"matrix": [4, 3], "x": 8.5, "y": 1},
-        {"matrix": [6, 2], "x": 9.5, "y": 1},
-        {"matrix": [6, 3], "x": 10.5, "y": 1},
-        {"matrix": [7, 3], "x": 11.5, "y": 1},
-        {"matrix": [7, 2], "x": 12.5, "y": 1},
-        {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [0, 4], "x": 1.75, "y": 2},
-        {"matrix": [0, 3], "x": 2.75, "y": 2},
-        {"matrix": [1, 4], "x": 3.75, "y": 2},
-        {"matrix": [1, 5], "x": 4.75, "y": 2},
-        {"matrix": [2, 4], "x": 5.75, "y": 2},
-        {"matrix": [2, 5], "x": 6.75, "y": 2},
-        {"matrix": [4, 5], "x": 7.75, "y": 2},
-        {"matrix": [4, 4], "x": 8.75, "y": 2},
-        {"matrix": [6, 5], "x": 9.75, "y": 2},
-        {"matrix": [6, 4], "x": 10.75, "y": 2},
-        {"matrix": [7, 4], "x": 11.75, "y": 2},
-        {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [0, 5], "x": 2.25, "y": 3},
-        {"matrix": [0, 6], "x": 3.25, "y": 3},
-        {"matrix": [0, 7], "x": 4.25, "y": 3},
-        {"matrix": [1, 6], "x": 5.25, "y": 3},
-        {"matrix": [1, 7], "x": 6.25, "y": 3},
-        {"matrix": [2, 6], "x": 7.25, "y": 3},
-        {"matrix": [4, 6], "x": 8.25, "y": 3},
-        {"matrix": [6, 6], "x": 9.25, "y": 3},
-        {"matrix": [7, 6], "x": 10.25, "y": 3},
-        {"matrix": [7, 5], "x": 11.25, "y": 3},
-        {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [5, 4], "x": 14, "y": 3},
-
-        {"matrix": [3, 5], "x": 1.5, "y": 4},
-        {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5},
-        {"matrix": [3, 7], "x": 4, "y": 4, "w": 6},
-        {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5},
-        {"matrix": [5, 6], "x": 11.5, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hhkb/yang/keyboard.json b/keyboards/hhkb/yang/keyboard.json
new file mode 100644
index 00000000000..a5725d6afaa
--- /dev/null
+++ b/keyboards/hhkb/yang/keyboard.json
@@ -0,0 +1,97 @@
+{
+  "keyboard_name": "HHKB BLE",
+  "manufacturer": "YANG",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4848",
+    "pid": "0x0001",
+    "device_version": "1.0.4"
+  },
+  "indicators": {
+    "caps_lock": "F4"
+  },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "lufa-ms",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true
+  },
+  "debounce": 0,
+  "community_layouts": ["60_hhkb"],
+  "layouts": {
+    "LAYOUT_60_hhkb": {
+      "layout": [
+        {"matrix": [3, 1], "x": 0, "y": 0},
+        {"matrix": [3, 0], "x": 1, "y": 0},
+        {"matrix": [0, 0], "x": 2, "y": 0},
+        {"matrix": [1, 0], "x": 3, "y": 0},
+        {"matrix": [1, 1], "x": 4, "y": 0},
+        {"matrix": [2, 0], "x": 5, "y": 0},
+        {"matrix": [2, 1], "x": 6, "y": 0},
+        {"matrix": [4, 0], "x": 7, "y": 0},
+        {"matrix": [4, 1], "x": 8, "y": 0},
+        {"matrix": [6, 0], "x": 9, "y": 0},
+        {"matrix": [6, 1], "x": 10, "y": 0},
+        {"matrix": [7, 0], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [5, 0], "x": 13, "y": 0},
+        {"matrix": [5, 1], "x": 14, "y": 0},
+
+        {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 1},
+        {"matrix": [0, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 2], "x": 4.5, "y": 1},
+        {"matrix": [2, 3], "x": 5.5, "y": 1},
+        {"matrix": [2, 2], "x": 6.5, "y": 1},
+        {"matrix": [4, 2], "x": 7.5, "y": 1},
+        {"matrix": [4, 3], "x": 8.5, "y": 1},
+        {"matrix": [6, 2], "x": 9.5, "y": 1},
+        {"matrix": [6, 3], "x": 10.5, "y": 1},
+        {"matrix": [7, 3], "x": 11.5, "y": 1},
+        {"matrix": [7, 2], "x": 12.5, "y": 1},
+        {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [0, 4], "x": 1.75, "y": 2},
+        {"matrix": [0, 3], "x": 2.75, "y": 2},
+        {"matrix": [1, 4], "x": 3.75, "y": 2},
+        {"matrix": [1, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 4], "x": 5.75, "y": 2},
+        {"matrix": [2, 5], "x": 6.75, "y": 2},
+        {"matrix": [4, 5], "x": 7.75, "y": 2},
+        {"matrix": [4, 4], "x": 8.75, "y": 2},
+        {"matrix": [6, 5], "x": 9.75, "y": 2},
+        {"matrix": [6, 4], "x": 10.75, "y": 2},
+        {"matrix": [7, 4], "x": 11.75, "y": 2},
+        {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [0, 5], "x": 2.25, "y": 3},
+        {"matrix": [0, 6], "x": 3.25, "y": 3},
+        {"matrix": [0, 7], "x": 4.25, "y": 3},
+        {"matrix": [1, 6], "x": 5.25, "y": 3},
+        {"matrix": [1, 7], "x": 6.25, "y": 3},
+        {"matrix": [2, 6], "x": 7.25, "y": 3},
+        {"matrix": [4, 6], "x": 8.25, "y": 3},
+        {"matrix": [6, 6], "x": 9.25, "y": 3},
+        {"matrix": [7, 6], "x": 10.25, "y": 3},
+        {"matrix": [7, 5], "x": 11.25, "y": 3},
+        {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [5, 4], "x": 14, "y": 3},
+
+        {"matrix": [3, 5], "x": 1.5, "y": 4},
+        {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [3, 7], "x": 4, "y": 4, "w": 6},
+        {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5},
+        {"matrix": [5, 6], "x": 11.5, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hhkb/yang/rules.mk b/keyboards/hhkb/yang/rules.mk
index 99f77d0c162..d8acce0a36b 100644
--- a/keyboards/hhkb/yang/rules.mk
+++ b/keyboards/hhkb/yang/rules.mk
@@ -1,16 +1,6 @@
 # MCU 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 = no            # USB Nkey Rollover
-
 # Custom matrix file for the HHKB
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json
deleted file mode 100644
index 67903569ab2..00000000000
--- a/keyboards/hidtech/bastyl/info.json
+++ /dev/null
@@ -1,116 +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": {
-        "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/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 2eba275490a..00000000000
--- a/keyboards/hidtech/bastyl/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 = 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/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json
deleted file mode 100644
index 6dd45b06f08..00000000000
--- a/keyboards/hillside/46/0_1/info.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "rows": ["C6", "D7", "E6", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
-     },
-    "diode_direction": "COL2ROW",
-    "usb": {
-      "vid": "0x4D4D",
-      "pid": "0x4846",
-      "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F4"}
-        ]
-    },
-    "features": {
-        "encoder": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F4", "pin_b": "F5"}
-                ]
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 4,
-        "split": true,
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.13},
-                {"matrix": [0, 1], "x": 1, "y": 0.93},
-                {"matrix": [0, 2], "x": 2.1, "y": 0.31},
-                {"matrix": [0, 3], "x": 3.2, "y": 0},
-                {"matrix": [0, 4], "x": 4.2, "y": 0.28},
-                {"matrix": [0, 5], "x": 5.2, "y": 0.42},
-
-                {"matrix": [4, 5], "x": 9.7, "y": 0.42},
-                {"matrix": [4, 4], "x": 10.7, "y": 0.28},
-                {"matrix": [4, 3], "x": 11.7, "y": 0},
-                {"matrix": [4, 2], "x": 12.8, "y": 0.31},
-                {"matrix": [4, 1], "x": 13.9, "y": 0.93},
-                {"matrix": [4, 0], "x": 14.9, "y": 1.13},
-
-                {"matrix": [1, 0], "x": 0.1, "y": 2.13},
-                {"matrix": [1, 1], "x": 1.1, "y": 1.93},
-                {"matrix": [1, 2], "x": 2.15, "y": 1.31},
-                {"matrix": [1, 3], "x": 3.2, "y": 1},
-                {"matrix": [1, 4], "x": 4.2, "y": 1.28},
-                {"matrix": [1, 5], "x": 5.2, "y": 1.42},
-
-                {"matrix": [5, 5], "x": 9.7, "y": 1.42},
-                {"matrix": [5, 4], "x": 10.7, "y": 1.28},
-                {"matrix": [5, 3], "x": 11.7, "y": 1},
-                {"matrix": [5, 2], "x": 12.75, "y": 1.31},
-                {"matrix": [5, 1], "x": 13.8, "y": 1.93},
-                {"matrix": [5, 0], "x": 14.8, "y": 2.13},
-
-                {"matrix": [2, 0], "x": 0.2, "y": 3.13},
-                {"matrix": [2, 1], "x": 1.2, "y": 2.93},
-                {"matrix": [2, 2], "x": 2.2, "y": 2.31},
-                {"matrix": [2, 3], "x": 3.2, "y": 2},
-                {"matrix": [2, 4], "x": 4.2, "y": 2.28},
-                {"matrix": [2, 5], "x": 5.2, "y": 2.42},
-                {"matrix": [3, 5], "x": 6.2, "y": 2.88},
-
-                {"matrix": [7, 5], "x": 8.7, "y": 2.88},
-                {"matrix": [6, 5], "x": 9.7, "y": 2.42},
-                {"matrix": [6, 4], "x": 10.7, "y": 2.28},
-                {"matrix": [6, 3], "x": 11.7, "y": 2},
-                {"matrix": [6, 2], "x": 12.7, "y": 2.31},
-                {"matrix": [6, 1], "x": 13.7, "y": 2.93},
-                {"matrix": [6, 0], "x": 14.7, "y": 3.13},
-
-                {"matrix": [3, 1], "x": 3.7, "y": 3.28},
-                {"matrix": [3, 2], "x": 4.7, "y": 3.42},
-                {"matrix": [3, 3], "x": 5.7, "y": 3.88},
-                {"matrix": [3, 4], "x": 6.7, "y": 4.44},
-
-                {"matrix": [7, 4], "x": 8.2, "y": 4.44},
-                {"matrix": [7, 3], "x": 9.2, "y": 3.88},
-                {"matrix": [7, 2], "x": 10.2, "y": 3.42},
-                {"matrix": [7, 1], "x": 11.2, "y": 3.28}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hillside/46/0_1/keyboard.json b/keyboards/hillside/46/0_1/keyboard.json
new file mode 100644
index 00000000000..7cb7150f3f2
--- /dev/null
+++ b/keyboards/hillside/46/0_1/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "rows": ["C6", "D7", "E6", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+     },
+    "diode_direction": "COL2ROW",
+    "usb": {
+      "vid": "0x4D4D",
+      "pid": "0x4846",
+      "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5"}
+                ]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 4,
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.13},
+                {"matrix": [0, 1], "x": 1, "y": 0.93},
+                {"matrix": [0, 2], "x": 2.1, "y": 0.31},
+                {"matrix": [0, 3], "x": 3.2, "y": 0},
+                {"matrix": [0, 4], "x": 4.2, "y": 0.28},
+                {"matrix": [0, 5], "x": 5.2, "y": 0.42},
+
+                {"matrix": [4, 5], "x": 9.7, "y": 0.42},
+                {"matrix": [4, 4], "x": 10.7, "y": 0.28},
+                {"matrix": [4, 3], "x": 11.7, "y": 0},
+                {"matrix": [4, 2], "x": 12.8, "y": 0.31},
+                {"matrix": [4, 1], "x": 13.9, "y": 0.93},
+                {"matrix": [4, 0], "x": 14.9, "y": 1.13},
+
+                {"matrix": [1, 0], "x": 0.1, "y": 2.13},
+                {"matrix": [1, 1], "x": 1.1, "y": 1.93},
+                {"matrix": [1, 2], "x": 2.15, "y": 1.31},
+                {"matrix": [1, 3], "x": 3.2, "y": 1},
+                {"matrix": [1, 4], "x": 4.2, "y": 1.28},
+                {"matrix": [1, 5], "x": 5.2, "y": 1.42},
+
+                {"matrix": [5, 5], "x": 9.7, "y": 1.42},
+                {"matrix": [5, 4], "x": 10.7, "y": 1.28},
+                {"matrix": [5, 3], "x": 11.7, "y": 1},
+                {"matrix": [5, 2], "x": 12.75, "y": 1.31},
+                {"matrix": [5, 1], "x": 13.8, "y": 1.93},
+                {"matrix": [5, 0], "x": 14.8, "y": 2.13},
+
+                {"matrix": [2, 0], "x": 0.2, "y": 3.13},
+                {"matrix": [2, 1], "x": 1.2, "y": 2.93},
+                {"matrix": [2, 2], "x": 2.2, "y": 2.31},
+                {"matrix": [2, 3], "x": 3.2, "y": 2},
+                {"matrix": [2, 4], "x": 4.2, "y": 2.28},
+                {"matrix": [2, 5], "x": 5.2, "y": 2.42},
+                {"matrix": [3, 5], "x": 6.2, "y": 2.88},
+
+                {"matrix": [7, 5], "x": 8.7, "y": 2.88},
+                {"matrix": [6, 5], "x": 9.7, "y": 2.42},
+                {"matrix": [6, 4], "x": 10.7, "y": 2.28},
+                {"matrix": [6, 3], "x": 11.7, "y": 2},
+                {"matrix": [6, 2], "x": 12.7, "y": 2.31},
+                {"matrix": [6, 1], "x": 13.7, "y": 2.93},
+                {"matrix": [6, 0], "x": 14.7, "y": 3.13},
+
+                {"matrix": [3, 1], "x": 3.7, "y": 3.28},
+                {"matrix": [3, 2], "x": 4.7, "y": 3.42},
+                {"matrix": [3, 3], "x": 5.7, "y": 3.88},
+                {"matrix": [3, 4], "x": 6.7, "y": 4.44},
+
+                {"matrix": [7, 4], "x": 8.2, "y": 4.44},
+                {"matrix": [7, 3], "x": 9.2, "y": 3.88},
+                {"matrix": [7, 2], "x": 10.2, "y": 3.42},
+                {"matrix": [7, 1], "x": 11.2, "y": 3.28}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk
deleted file mode 100644
index 093b81abfe0..00000000000
--- a/keyboards/hillside/46/0_1/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-LTO_ENABLE = yes            # Use link time optimization for smaller firmware
-
-# If you add a haptic board,
-# enable it and set its driver here or in your keymap folder
-# The Pimoroni board's driver is DRV2605L 
-# HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json
deleted file mode 100644
index 4f565f5cdc6..00000000000
--- a/keyboards/hillside/48/0_1/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "rows": ["D7", "E6", "B4", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
-     },
-    "diode_direction": "COL2ROW",
-    "usb": {
-      "vid": "0xFEED",
-      "pid": "0x67C0",
-      "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F4"}
-        ]
-    },
-    "features": {
-        "encoder": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F4", "pin_b": "F5"}
-                ]
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 5,
-        "split": true,
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.93},
-                {"matrix": [0, 1], "x": 1, "y": 0.93},
-                {"matrix": [0, 2], "x": 2, "y": 0.31},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.28},
-                {"matrix": [0, 5], "x": 5, "y": 0.42},
-
-                {"matrix": [4, 5], "x": 9.5, "y": 0.42},
-                {"matrix": [4, 4], "x": 10.5, "y": 0.28},
-                {"matrix": [4, 3], "x": 11.5, "y": 0},
-                {"matrix": [4, 2], "x": 12.5, "y": 0.31},
-                {"matrix": [4, 1], "x": 13.5, "y": 0.93},
-                {"matrix": [4, 0], "x": 14.5, "y": 0.93},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.93},
-                {"matrix": [1, 1], "x": 1, "y": 1.93},
-                {"matrix": [1, 2], "x": 2, "y": 1.31},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.28},
-                {"matrix": [1, 5], "x": 5, "y": 1.42},
-
-                {"matrix": [5, 5], "x": 9.5, "y": 1.42},
-                {"matrix": [5, 4], "x": 10.5, "y": 1.28},
-                {"matrix": [5, 3], "x": 11.5, "y": 1},
-                {"matrix": [5, 2], "x": 12.5, "y": 1.31},
-                {"matrix": [5, 1], "x": 13.5, "y": 1.93},
-                {"matrix": [5, 0], "x": 14.5, "y": 1.93},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.93},
-                {"matrix": [2, 1], "x": 1, "y": 2.93},
-                {"matrix": [2, 2], "x": 2, "y": 2.31},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.28},
-                {"matrix": [2, 5], "x": 5, "y": 2.42},
-                {"matrix": [3, 5], "x": 6, "y": 2.78},
-
-                {"matrix": [7, 5], "x": 8.5, "y": 2.78},
-                {"matrix": [6, 5], "x": 9.5, "y": 2.42},
-                {"matrix": [6, 4], "x": 10.5, "y": 2.28},
-                {"matrix": [6, 3], "x": 11.5, "y": 2},
-                {"matrix": [6, 2], "x": 12.5, "y": 2.31},
-                {"matrix": [6, 1], "x": 13.5, "y": 2.93},
-                {"matrix": [6, 0], "x": 14.5, "y": 2.93},
-
-                {"matrix": [3, 0], "x": 2, "y": 3.31},
-                {"matrix": [3, 1], "x": 3.5, "y": 3.28},
-                {"matrix": [3, 2], "x": 4.5, "y": 3.42},
-                {"matrix": [3, 3], "x": 5.5, "y": 3.78},
-                {"matrix": [3, 4], "x": 6.5, "y": 4.14},
-
-                {"matrix": [7, 4], "x": 8, "y": 4.14},
-                {"matrix": [7, 3], "x": 9, "y": 3.78},
-                {"matrix": [7, 2], "x": 10, "y": 3.42},
-                {"matrix": [7, 1], "x": 11, "y": 3.28},
-                {"matrix": [7, 0], "x": 12.5, "y": 3.31}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hillside/48/0_1/keyboard.json b/keyboards/hillside/48/0_1/keyboard.json
new file mode 100644
index 00000000000..b640bc0cbf2
--- /dev/null
+++ b/keyboards/hillside/48/0_1/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "rows": ["D7", "E6", "B4", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+     },
+    "diode_direction": "COL2ROW",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x67C0",
+      "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5"}
+                ]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 5,
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.93},
+                {"matrix": [0, 1], "x": 1, "y": 0.93},
+                {"matrix": [0, 2], "x": 2, "y": 0.31},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.28},
+                {"matrix": [0, 5], "x": 5, "y": 0.42},
+
+                {"matrix": [4, 5], "x": 9.5, "y": 0.42},
+                {"matrix": [4, 4], "x": 10.5, "y": 0.28},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 2], "x": 12.5, "y": 0.31},
+                {"matrix": [4, 1], "x": 13.5, "y": 0.93},
+                {"matrix": [4, 0], "x": 14.5, "y": 0.93},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.93},
+                {"matrix": [1, 1], "x": 1, "y": 1.93},
+                {"matrix": [1, 2], "x": 2, "y": 1.31},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.28},
+                {"matrix": [1, 5], "x": 5, "y": 1.42},
+
+                {"matrix": [5, 5], "x": 9.5, "y": 1.42},
+                {"matrix": [5, 4], "x": 10.5, "y": 1.28},
+                {"matrix": [5, 3], "x": 11.5, "y": 1},
+                {"matrix": [5, 2], "x": 12.5, "y": 1.31},
+                {"matrix": [5, 1], "x": 13.5, "y": 1.93},
+                {"matrix": [5, 0], "x": 14.5, "y": 1.93},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.93},
+                {"matrix": [2, 1], "x": 1, "y": 2.93},
+                {"matrix": [2, 2], "x": 2, "y": 2.31},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.28},
+                {"matrix": [2, 5], "x": 5, "y": 2.42},
+                {"matrix": [3, 5], "x": 6, "y": 2.78},
+
+                {"matrix": [7, 5], "x": 8.5, "y": 2.78},
+                {"matrix": [6, 5], "x": 9.5, "y": 2.42},
+                {"matrix": [6, 4], "x": 10.5, "y": 2.28},
+                {"matrix": [6, 3], "x": 11.5, "y": 2},
+                {"matrix": [6, 2], "x": 12.5, "y": 2.31},
+                {"matrix": [6, 1], "x": 13.5, "y": 2.93},
+                {"matrix": [6, 0], "x": 14.5, "y": 2.93},
+
+                {"matrix": [3, 0], "x": 2, "y": 3.31},
+                {"matrix": [3, 1], "x": 3.5, "y": 3.28},
+                {"matrix": [3, 2], "x": 4.5, "y": 3.42},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.78},
+                {"matrix": [3, 4], "x": 6.5, "y": 4.14},
+
+                {"matrix": [7, 4], "x": 8, "y": 4.14},
+                {"matrix": [7, 3], "x": 9, "y": 3.78},
+                {"matrix": [7, 2], "x": 10, "y": 3.42},
+                {"matrix": [7, 1], "x": 11, "y": 3.28},
+                {"matrix": [7, 0], "x": 12.5, "y": 3.31}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk
deleted file mode 100644
index 093b81abfe0..00000000000
--- a/keyboards/hillside/48/0_1/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-LTO_ENABLE = yes            # Use link time optimization for smaller firmware
-
-# If you add a haptic board,
-# enable it and set its driver here or in your keymap folder
-# The Pimoroni board's driver is DRV2605L 
-# HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json
deleted file mode 100644
index 2064ba617cc..00000000000
--- a/keyboards/hillside/52/0_1/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "rows": ["C6", "D7", "E6", "B4", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
-     },
-    "diode_direction": "COL2ROW",
-    "usb": {
-      "vid": "0x4D4D",
-      "pid": "0x4852",
-      "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F4"}
-        ]
-    },
-    "features": {
-        "encoder": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F4", "pin_b": "F5"}
-                ]
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 5,
-        "split": true,
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.13},
-                {"matrix": [0, 1], "x": 1, "y": 0.93},
-                {"matrix": [0, 2], "x": 2.1, "y": 0.31},
-                {"matrix": [0, 3], "x": 3.2, "y": 0},
-                {"matrix": [0, 4], "x": 4.2, "y": 0.28},
-                {"matrix": [0, 5], "x": 5.2, "y": 0.42},
-
-                {"matrix": [5, 5], "x": 9.7, "y": 0.42},
-                {"matrix": [5, 4], "x": 10.7, "y": 0.28},
-                {"matrix": [5, 3], "x": 11.7, "y": 0},
-                {"matrix": [5, 2], "x": 12.8, "y": 0.31},
-                {"matrix": [5, 1], "x": 13.9, "y": 0.93},
-                {"matrix": [5, 0], "x": 14.9, "y": 1.13},
-
-                {"matrix": [1, 0], "x": 0.1, "y": 2.13},
-                {"matrix": [1, 1], "x": 1.1, "y": 1.93},
-                {"matrix": [1, 2], "x": 2.15, "y": 1.31},
-                {"matrix": [1, 3], "x": 3.2, "y": 1},
-                {"matrix": [1, 4], "x": 4.2, "y": 1.28},
-                {"matrix": [1, 5], "x": 5.2, "y": 1.42},
-
-                {"matrix": [6, 5], "x": 9.7, "y": 1.42},
-                {"matrix": [6, 4], "x": 10.7, "y": 1.28},
-                {"matrix": [6, 3], "x": 11.7, "y": 1},
-                {"matrix": [6, 2], "x": 12.75, "y": 1.31},
-                {"matrix": [6, 1], "x": 13.8, "y": 1.93},
-                {"matrix": [6, 0], "x": 14.8, "y": 2.13},
-
-                {"matrix": [2, 0], "x": 0.2, "y": 3.13},
-                {"matrix": [2, 1], "x": 1.2, "y": 2.93},
-                {"matrix": [2, 2], "x": 2.2, "y": 2.31},
-                {"matrix": [2, 3], "x": 3.2, "y": 2},
-                {"matrix": [2, 4], "x": 4.2, "y": 2.28},
-                {"matrix": [2, 5], "x": 5.2, "y": 2.42},
-                {"matrix": [4, 5], "x": 6.2, "y": 2.88},
-
-                {"matrix": [9, 5], "x": 8.7, "y": 2.88},
-                {"matrix": [7, 5], "x": 9.7, "y": 2.42},
-                {"matrix": [7, 4], "x": 10.7, "y": 2.28},
-                {"matrix": [7, 3], "x": 11.7, "y": 2},
-                {"matrix": [7, 2], "x": 12.7, "y": 2.31},
-                {"matrix": [7, 1], "x": 13.7, "y": 2.93},
-                {"matrix": [7, 0], "x": 14.7, "y": 3.13},
-
-                {"matrix": [3, 0], "x": 0.3, "y": 4.13},
-                {"matrix": [3, 1], "x": 1.3, "y": 3.93},
-                {"matrix": [3, 2], "x": 2.3, "y": 3.73},
-                {"matrix": [4, 1], "x": 3.7, "y": 3.28},
-                {"matrix": [4, 2], "x": 4.7, "y": 3.42},
-                {"matrix": [4, 3], "x": 5.7, "y": 3.88},
-                {"matrix": [4, 4], "x": 6.7, "y": 4.44},
-
-                {"matrix": [9, 4], "x": 8.2, "y": 4.44},
-                {"matrix": [9, 3], "x": 9.2, "y": 3.88},
-                {"matrix": [9, 2], "x": 10.2, "y": 3.42},
-                {"matrix": [9, 1], "x": 11.2, "y": 3.28},
-                {"matrix": [8, 2], "x": 12.6, "y": 3.73},
-                {"matrix": [8, 1], "x": 13.6, "y": 3.93},
-                {"matrix": [8, 0], "x": 14.6, "y": 4.13}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hillside/52/0_1/keyboard.json b/keyboards/hillside/52/0_1/keyboard.json
new file mode 100644
index 00000000000..0949fa9bb8e
--- /dev/null
+++ b/keyboards/hillside/52/0_1/keyboard.json
@@ -0,0 +1,114 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "rows": ["C6", "D7", "E6", "B4", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+     },
+    "diode_direction": "COL2ROW",
+    "usb": {
+      "vid": "0x4D4D",
+      "pid": "0x4852",
+      "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5"}
+                ]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 5,
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.13},
+                {"matrix": [0, 1], "x": 1, "y": 0.93},
+                {"matrix": [0, 2], "x": 2.1, "y": 0.31},
+                {"matrix": [0, 3], "x": 3.2, "y": 0},
+                {"matrix": [0, 4], "x": 4.2, "y": 0.28},
+                {"matrix": [0, 5], "x": 5.2, "y": 0.42},
+
+                {"matrix": [5, 5], "x": 9.7, "y": 0.42},
+                {"matrix": [5, 4], "x": 10.7, "y": 0.28},
+                {"matrix": [5, 3], "x": 11.7, "y": 0},
+                {"matrix": [5, 2], "x": 12.8, "y": 0.31},
+                {"matrix": [5, 1], "x": 13.9, "y": 0.93},
+                {"matrix": [5, 0], "x": 14.9, "y": 1.13},
+
+                {"matrix": [1, 0], "x": 0.1, "y": 2.13},
+                {"matrix": [1, 1], "x": 1.1, "y": 1.93},
+                {"matrix": [1, 2], "x": 2.15, "y": 1.31},
+                {"matrix": [1, 3], "x": 3.2, "y": 1},
+                {"matrix": [1, 4], "x": 4.2, "y": 1.28},
+                {"matrix": [1, 5], "x": 5.2, "y": 1.42},
+
+                {"matrix": [6, 5], "x": 9.7, "y": 1.42},
+                {"matrix": [6, 4], "x": 10.7, "y": 1.28},
+                {"matrix": [6, 3], "x": 11.7, "y": 1},
+                {"matrix": [6, 2], "x": 12.75, "y": 1.31},
+                {"matrix": [6, 1], "x": 13.8, "y": 1.93},
+                {"matrix": [6, 0], "x": 14.8, "y": 2.13},
+
+                {"matrix": [2, 0], "x": 0.2, "y": 3.13},
+                {"matrix": [2, 1], "x": 1.2, "y": 2.93},
+                {"matrix": [2, 2], "x": 2.2, "y": 2.31},
+                {"matrix": [2, 3], "x": 3.2, "y": 2},
+                {"matrix": [2, 4], "x": 4.2, "y": 2.28},
+                {"matrix": [2, 5], "x": 5.2, "y": 2.42},
+                {"matrix": [4, 5], "x": 6.2, "y": 2.88},
+
+                {"matrix": [9, 5], "x": 8.7, "y": 2.88},
+                {"matrix": [7, 5], "x": 9.7, "y": 2.42},
+                {"matrix": [7, 4], "x": 10.7, "y": 2.28},
+                {"matrix": [7, 3], "x": 11.7, "y": 2},
+                {"matrix": [7, 2], "x": 12.7, "y": 2.31},
+                {"matrix": [7, 1], "x": 13.7, "y": 2.93},
+                {"matrix": [7, 0], "x": 14.7, "y": 3.13},
+
+                {"matrix": [3, 0], "x": 0.3, "y": 4.13},
+                {"matrix": [3, 1], "x": 1.3, "y": 3.93},
+                {"matrix": [3, 2], "x": 2.3, "y": 3.73},
+                {"matrix": [4, 1], "x": 3.7, "y": 3.28},
+                {"matrix": [4, 2], "x": 4.7, "y": 3.42},
+                {"matrix": [4, 3], "x": 5.7, "y": 3.88},
+                {"matrix": [4, 4], "x": 6.7, "y": 4.44},
+
+                {"matrix": [9, 4], "x": 8.2, "y": 4.44},
+                {"matrix": [9, 3], "x": 9.2, "y": 3.88},
+                {"matrix": [9, 2], "x": 10.2, "y": 3.42},
+                {"matrix": [9, 1], "x": 11.2, "y": 3.28},
+                {"matrix": [8, 2], "x": 12.6, "y": 3.73},
+                {"matrix": [8, 1], "x": 13.6, "y": 3.93},
+                {"matrix": [8, 0], "x": 14.6, "y": 4.13}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk
deleted file mode 100644
index 093b81abfe0..00000000000
--- a/keyboards/hillside/52/0_1/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-LTO_ENABLE = yes            # Use link time optimization for smaller firmware
-
-# If you add a haptic board,
-# enable it and set its driver here or in your keymap folder
-# The Pimoroni board's driver is DRV2605L 
-# HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json
deleted file mode 100644
index ca92b3f4a52..00000000000
--- a/keyboards/hineybush/hbcp/info.json
+++ /dev/null
@@ -1,281 +0,0 @@
-{
-    "keyboard_name": "hbcp",
-    "manufacturer": "hineybush",
-    "url": "",
-    "maintainer": "hineybush",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xECE8",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B7",
-        "breathing": true
-    },
-    "ws2812": {
-        "pin": "B0"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 27,
-        "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": "at90usb1286",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 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.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": [0, 13], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"matrix": [1, 17], "x": 18.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, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.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, 12], "x": 12.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"matrix": [3, 17], "x": 18.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, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 18.5, "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},
-                {"matrix": [5, 10], "x": 11, "y": 5.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25},
-
-                {"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},
-
-                {"matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_wkl": {
-            "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, 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.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": [0, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"matrix": [1, 17], "x": 18.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, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"matrix": [3, 17], "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, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 16], "x": 17.5, "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.5},
-                {"matrix": [5, 5], "x": 3, "y": 5.25, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "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},
-
-                {"matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"matrix": [5, 17], "x": 18.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hineybush/hbcp/keyboard.json b/keyboards/hineybush/hbcp/keyboard.json
new file mode 100644
index 00000000000..ab36bfaea09
--- /dev/null
+++ b/keyboards/hineybush/hbcp/keyboard.json
@@ -0,0 +1,291 @@
+{
+    "keyboard_name": "hbcp",
+    "manufacturer": "hineybush",
+    "url": "",
+    "maintainer": "hineybush",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xECE8",
+        "device_version": "0.0.1"
+    },
+    "backlight": {
+        "pin": "B7",
+        "breathing": true
+    },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 27,
+        "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": "at90usb1286",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 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.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": [0, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 18.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, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.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, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 18.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, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "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},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"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},
+
+                {"matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_wkl": {
+            "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, 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.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": [0, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 18.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, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"matrix": [3, 17], "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, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 17.5, "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.5},
+                {"matrix": [5, 5], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "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},
+
+                {"matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hineybush/hbcp/rules.mk b/keyboards/hineybush/hbcp/rules.mk
index f60d6afa1e2..30ce5d293b7 100644
--- a/keyboards/hineybush/hbcp/rules.mk
+++ b/keyboards/hineybush/hbcp/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 = 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
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
deleted file mode 100644
index 6eb5cbd80ec..00000000000
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-    "keyboard_name": "K552 Kumara",
-    "manufacturer": "HorrorTroll",
-    "url": "",
-    "maintainer": "HorrorTroll",
-    "usb": {
-        "vid": "0x7516",
-        "pid": "0x5104",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "ws2812": {
-        "pin": "C14"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "cycle_out_in": true,
-            "cycle_pinwheel": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 200
-    },
-    "matrix_pins": {
-        "cols": ["B15", "C6", "C7", "A3", "A1", "C3", "C1", "B14", "B13", "A9", "B3", "B4", "A0", "C11", "C4", "C0", "C2"],
-        "rows": ["C12", "C10", "A10", "A8", "C8", "C9"]
-    },
-    "diode_direction": "ROW2COL",
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 2048
-        }
-    },
-    "community_layouts": ["tkl_ansi"],
-    "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.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 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, 13], "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, 3], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 8], "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/horrortroll/handwired_k552/keyboard.json b/keyboards/horrortroll/handwired_k552/keyboard.json
new file mode 100644
index 00000000000..6bbfa86e124
--- /dev/null
+++ b/keyboards/horrortroll/handwired_k552/keyboard.json
@@ -0,0 +1,167 @@
+{
+    "keyboard_name": "K552 Kumara",
+    "manufacturer": "HorrorTroll",
+    "url": "",
+    "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x5104",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "ws2812": {
+        "pin": "C14"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
+    },
+    "matrix_pins": {
+        "cols": ["B15", "C6", "C7", "A3", "A1", "C3", "C1", "B14", "B13", "A9", "B3", "B4", "A0", "C11", "C4", "C0", "C2"],
+        "rows": ["C12", "C10", "A10", "A8", "C8", "C9"]
+    },
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 2048
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "oled": true,
+        "wpm": true
+    },
+    "community_layouts": ["tkl_ansi"],
+    "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.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 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, 13], "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, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "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/horrortroll/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
index 6d6ec253db3..b2ab6eed6df 100644
--- a/keyboards/horrortroll/handwired_k552/rules.mk
+++ b/keyboards/horrortroll/handwired_k552/rules.mk
@@ -12,23 +12,3 @@ BOARD = STM32_F103_STM32DUINO
 BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
-
-# OLED enabled
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json
deleted file mode 100644
index 7b0b1c394b3..00000000000
--- a/keyboards/horrortroll/lemon40/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "keyboard_name": "Lemon40",
-    "manufacturer": "HorrorTroll",
-    "url": "",
-    "maintainer": "HorrorTroll",
-    "usb": {
-        "vid": "0x7516",
-        "pid": "0x2434",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "rgblight": {
-        "led_count": 15,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "alternating": true
-        }
-    },
-    "ws2812": {
-        "pin": "F4"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "B1", "B3", "B2", "B6", "F7"],
-        "rows": ["D7", "E6", "B4", "B5", "D4", "C6", "D2", "D3"]
-    },
-    "diode_direction": "COL2ROW",
-    "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": [0, 6], "x": 8.25, "y": 0},
-                {"matrix": [4, 0], "x": 9.25, "y": 0},
-                {"matrix": [4, 1], "x": 10.25, "y": 0},
-                {"matrix": [4, 2], "x": 11.25, "y": 0},
-                {"matrix": [4, 3], "x": 12.25, "y": 0},
-                {"matrix": [4, 4], "x": 13.25, "y": 0},
-                {"matrix": [4, 5], "x": 14.25, "y": 0, "w": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
-                {"matrix": [1, 1], "x": 1.75, "y": 1},
-                {"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": 8.5, "y": 1},
-                {"matrix": [5, 0], "x": 9.5, "y": 1},
-                {"matrix": [5, 1], "x": 10.5, "y": 1},
-                {"matrix": [5, 2], "x": 11.5, "y": 1},
-                {"matrix": [5, 3], "x": 12.5, "y": 1},
-                {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
-                {"matrix": [2, 1], "x": 2.25, "y": 2},
-                {"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": 8, "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.25, "y": 2},
-                {"matrix": [6, 4], "x": 13.25, "y": 2},
-                {"matrix": [6, 5], "x": 14.25, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.75},
-
-                {"matrix": [7, 0], "x": 8, "y": 3, "w": 2.25},
-                {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.25},
-
-                {"matrix": [7, 3], "x": 12.25, "y": 3},
-                {"matrix": [7, 4], "x": 13.25, "y": 3},
-                {"matrix": [7, 5], "x": 14.25, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/horrortroll/lemon40/keyboard.json b/keyboards/horrortroll/lemon40/keyboard.json
new file mode 100644
index 00000000000..6303fb70bba
--- /dev/null
+++ b/keyboards/horrortroll/lemon40/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Lemon40",
+    "manufacturer": "HorrorTroll",
+    "url": "",
+    "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x2434",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "rgblight": {
+        "led_count": 15,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true
+        }
+    },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "B1", "B3", "B2", "B6", "F7"],
+        "rows": ["D7", "E6", "B4", "B5", "D4", "C6", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true,
+        "wpm": true
+    },
+    "build": {
+        "lto": true
+    },
+    "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": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [4, 0], "x": 9.25, "y": 0},
+                {"matrix": [4, 1], "x": 10.25, "y": 0},
+                {"matrix": [4, 2], "x": 11.25, "y": 0},
+                {"matrix": [4, 3], "x": 12.25, "y": 0},
+                {"matrix": [4, 4], "x": 13.25, "y": 0},
+                {"matrix": [4, 5], "x": 14.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1},
+                {"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": 8.5, "y": 1},
+                {"matrix": [5, 0], "x": 9.5, "y": 1},
+                {"matrix": [5, 1], "x": 10.5, "y": 1},
+                {"matrix": [5, 2], "x": 11.5, "y": 1},
+                {"matrix": [5, 3], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2},
+                {"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": 8, "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.25, "y": 2},
+                {"matrix": [6, 4], "x": 13.25, "y": 2},
+                {"matrix": [6, 5], "x": 14.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.75},
+
+                {"matrix": [7, 0], "x": 8, "y": 3, "w": 2.25},
+                {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.25},
+
+                {"matrix": [7, 3], "x": 12.25, "y": 3},
+                {"matrix": [7, 4], "x": 13.25, "y": 3},
+                {"matrix": [7, 5], "x": 14.25, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/lemon40/rules.mk b/keyboards/horrortroll/lemon40/rules.mk
index 9ac59719d8e..89d3a12a0b6 100644
--- a/keyboards/horrortroll/lemon40/rules.mk
+++ b/keyboards/horrortroll/lemon40/rules.mk
@@ -1,21 +1 @@
 SRC += lib/bongocat.c
-
-# 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
-
-# OLED enabled
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-
-# Additional thing to reduce compiled size
-LTO_ENABLE = yes
diff --git a/keyboards/horrortroll/nyx/rev1/info.json b/keyboards/horrortroll/nyx/rev1/keyboard.json
similarity index 100%
rename from keyboards/horrortroll/nyx/rev1/info.json
rename to keyboards/horrortroll/nyx/rev1/keyboard.json
diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/info.json
deleted file mode 100644
index 8184588e5d7..00000000000
--- a/keyboards/hotdox/info.json
+++ /dev/null
@@ -1,402 +0,0 @@
-{
-    "keyboard_name": "Ergodox 76 \"HotDox\"",
-    "manufacturer": "Alpaca Keyboards",
-    "maintainer": "layne001365",
-    "usb": {
-      "vid": "0x414B",
-      "pid": "0x0001",
-      "device_version": "0.0.1"
-    },
-    "backlight": {
-      "pin": "B7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "tapping": {
-      "toggle": 1
-    },
-    "community_layouts": ["ergodox"],
-    "layouts": {
-    "LAYOUT_ergodox": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-        {"matrix": [0, 3], "x": 3.5, "y": 0},
-        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-        {"matrix": [4, 3], "x": 3.5, "y": 4},
-        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 6], "x": 7, "y": 5},
-
-        {"matrix": [5, 4], "x": 7, "y": 6},
-        {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
-        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
-
-        {"matrix": [5, 3], "x": 7, "y": 7},
-
-        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
-        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
-        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
-        {"matrix": [0, 10], "x": 12.5, "y": 0},
-        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
-        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
-        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
-
-        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
-        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
-        {"matrix": [1, 10], "x": 12.5, "y": 1},
-        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
-        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
-        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
-
-        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
-        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
-        {"matrix": [2, 10], "x": 12.5, "y": 2},
-        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
-        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
-        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
-        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
-        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
-        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
-        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
-
-        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
-        {"matrix": [4, 10], "x": 12.5, "y": 4},
-        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
-        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
-        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
-
-        {"matrix": [5, 7], "x": 9, "y": 5},
-        {"matrix": [5, 8], "x": 10, "y": 5},
-
-        {"matrix": [5, 9], "x": 9, "y": 6},
-
-        {"matrix": [5, 10], "x": 9, "y": 7},
-
-        {"matrix": [5, 11], "x": 10, "y": 6, "h": 2},
-        {"matrix": [5, 12], "x": 11, "y": 6, "h": 2}
-      ]
-    },
-    "LAYOUT_ergodox_pretty": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-        {"matrix": [0, 3], "x": 3.5, "y": 0},
-        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
-        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
-        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
-        {"matrix": [0, 10], "x": 12.5, "y": 0},
-        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
-        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
-        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
-        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
-        {"matrix": [1, 10], "x": 12.5, "y": 1},
-        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
-        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
-        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
-        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
-        {"matrix": [2, 10], "x": 12.5, "y": 2},
-        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
-        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
-        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
-        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
-        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
-        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
-        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
-
-        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-        {"matrix": [4, 3], "x": 3.5, "y": 4},
-        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
-        {"matrix": [4, 10], "x": 12.5, "y": 4},
-        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
-        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
-        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 6], "x": 7, "y": 5},
-        {"matrix": [5, 7], "x": 9, "y": 5},
-        {"matrix": [5, 8], "x": 10, "y": 5},
-
-        {"matrix": [5, 4], "x": 7, "y": 6},
-        {"matrix": [5, 9], "x": 9, "y": 6},
-        {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
-        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
-
-        {"matrix": [5, 3], "x": 7, "y": 7},
-        {"matrix": [5, 10], "x": 9, "y": 7},
-
-        {"matrix": [5, 11], "x": 10, "y": 6, "h": 2},
-        {"matrix": [5, 12], "x": 11, "y": 6, "h": 2}
-      ]
-    },
-    "LAYOUT_ergodox_80": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-        {"matrix": [0, 3], "x": 3.5, "y": 0},
-        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-        {"matrix": [4, 3], "x": 3.5, "y": 4},
-        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 6], "x": 7, "y": 5},
-        {"matrix": [4, 5], "x": 5, "y": 6},
-        {"matrix": [4, 6], "x": 6, "y": 6},
-        {"matrix": [5, 4], "x": 7, "y": 6},
-        {"matrix": [5, 3], "x": 5, "y": 7},
-        {"matrix": [5, 2], "x": 6, "y": 7},
-        {"matrix": [5, 1], "x": 7, "y": 7},
-
-        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
-        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
-        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
-        {"matrix": [0, 10], "x": 12.5, "y": 0},
-        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
-        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
-        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
-
-        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
-        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
-        {"matrix": [1, 10], "x": 12.5, "y": 1},
-        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
-        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
-        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
-
-        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
-        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
-        {"matrix": [2, 10], "x": 12.5, "y": 2},
-        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
-        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
-        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
-        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
-        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
-        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
-        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
-
-        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
-        {"matrix": [4, 10], "x": 12.5, "y": 4},
-        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
-        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
-        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
-
-        {"matrix": [5, 7], "x": 9, "y": 5},
-        {"matrix": [5, 8], "x": 10, "y": 5},
-
-        {"matrix": [5, 9], "x": 9, "y": 6},
-        {"matrix": [4, 7], "x": 10, "y": 6},
-        {"matrix": [4, 8], "x": 11, "y": 6},
-
-        {"matrix": [5, 10], "x": 9, "y": 7},
-        {"matrix": [5, 11], "x": 10, "y": 7},
-        {"matrix": [5, 12], "x": 11, "y": 7}
-      ]
-    },
-    "LAYOUT_ergodox_pretty_80": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-        {"matrix": [0, 3], "x": 3.5, "y": 0},
-        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
-        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
-        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
-        {"matrix": [0, 10], "x": 12.5, "y": 0},
-        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
-        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
-        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
-        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
-        {"matrix": [1, 10], "x": 12.5, "y": 1},
-        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
-        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
-        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
-        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
-        {"matrix": [2, 10], "x": 12.5, "y": 2},
-        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
-        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
-        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
-        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
-        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
-        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
-        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
-
-        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-        {"matrix": [4, 3], "x": 3.5, "y": 4},
-        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
-        {"matrix": [4, 10], "x": 12.5, "y": 4},
-        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
-        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
-        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 6], "x": 7, "y": 5},
-        {"matrix": [5, 7], "x": 9, "y": 5},
-        {"matrix": [5, 8], "x": 10, "y": 5},
-
-        {"matrix": [4, 5], "x": 5, "y": 6},
-        {"matrix": [4, 6], "x": 6, "y": 6},
-        {"matrix": [5, 4], "x": 7, "y": 6},
-        {"matrix": [5, 9], "x": 9, "y": 6},
-        {"matrix": [4, 7], "x": 10, "y": 6},
-        {"matrix": [4, 8], "x": 11, "y": 6},
-
-        {"matrix": [5, 1], "x": 5, "y": 7},
-        {"matrix": [5, 2], "x": 6, "y": 7},
-        {"matrix": [5, 3], "x": 7, "y": 7},
-        {"matrix": [5, 10], "x": 9, "y": 7},
-        {"matrix": [5, 11], "x": 10, "y": 7},
-        {"matrix": [5, 12], "x": 11, "y": 7}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hotdox/keyboard.json b/keyboards/hotdox/keyboard.json
new file mode 100644
index 00000000000..5d2c3ec5acd
--- /dev/null
+++ b/keyboards/hotdox/keyboard.json
@@ -0,0 +1,411 @@
+{
+    "keyboard_name": "Ergodox 76 \"HotDox\"",
+    "manufacturer": "Alpaca Keyboards",
+    "maintainer": "layne001365",
+    "usb": {
+      "vid": "0x414B",
+      "pid": "0x0001",
+      "device_version": "0.0.1"
+    },
+    "backlight": {
+      "pin": "B7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "backlight": true,
+        "unicode": true
+    },
+    "tapping": {
+      "toggle": 1
+    },
+    "community_layouts": ["ergodox"],
+    "layouts": {
+    "LAYOUT_ergodox": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+
+        {"matrix": [5, 3], "x": 7, "y": 7},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
+
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
+
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
+
+        {"matrix": [5, 9], "x": 9, "y": 6},
+
+        {"matrix": [5, 10], "x": 9, "y": 7},
+
+        {"matrix": [5, 11], "x": 10, "y": 6, "h": 2},
+        {"matrix": [5, 12], "x": 11, "y": 6, "h": 2}
+      ]
+    },
+    "LAYOUT_ergodox_pretty": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
+
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
+
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 9], "x": 9, "y": 6},
+        {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+
+        {"matrix": [5, 3], "x": 7, "y": 7},
+        {"matrix": [5, 10], "x": 9, "y": 7},
+
+        {"matrix": [5, 11], "x": 10, "y": 6, "h": 2},
+        {"matrix": [5, 12], "x": 11, "y": 6, "h": 2}
+      ]
+    },
+    "LAYOUT_ergodox_80": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+        {"matrix": [4, 5], "x": 5, "y": 6},
+        {"matrix": [4, 6], "x": 6, "y": 6},
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 3], "x": 5, "y": 7},
+        {"matrix": [5, 2], "x": 6, "y": 7},
+        {"matrix": [5, 1], "x": 7, "y": 7},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
+
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
+
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
+
+        {"matrix": [5, 9], "x": 9, "y": 6},
+        {"matrix": [4, 7], "x": 10, "y": 6},
+        {"matrix": [4, 8], "x": 11, "y": 6},
+
+        {"matrix": [5, 10], "x": 9, "y": 7},
+        {"matrix": [5, 11], "x": 10, "y": 7},
+        {"matrix": [5, 12], "x": 11, "y": 7}
+      ]
+    },
+    "LAYOUT_ergodox_pretty_80": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
+
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
+
+        {"matrix": [4, 5], "x": 5, "y": 6},
+        {"matrix": [4, 6], "x": 6, "y": 6},
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 9], "x": 9, "y": 6},
+        {"matrix": [4, 7], "x": 10, "y": 6},
+        {"matrix": [4, 8], "x": 11, "y": 6},
+
+        {"matrix": [5, 1], "x": 5, "y": 7},
+        {"matrix": [5, 2], "x": 6, "y": 7},
+        {"matrix": [5, 3], "x": 7, "y": 7},
+        {"matrix": [5, 10], "x": 9, "y": 7},
+        {"matrix": [5, 11], "x": 10, "y": 7},
+        {"matrix": [5, 12], "x": 11, "y": 7}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hotdox/rules.mk b/keyboards/hotdox/rules.mk
index 8e11eeabe08..f5dfc77dd19 100644
--- a/keyboards/hotdox/rules.mk
+++ b/keyboards/hotdox/rules.mk
@@ -1,17 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
 CUSTOM_MATRIX           = yes # Custom matrix file for the ErgoDone
-UNICODE_ENABLE          = yes # Unicode
-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
-SWAP_HANDS_ENABLE       = no  # Disable Onehand
-RGBLIGHT_ENABLE         = no
 
 # project specific files
 SRC =  matrix.c     \
diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json
deleted file mode 100644
index f9d77c3513a..00000000000
--- a/keyboards/hs60/v1/info.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  "keyboard_name": "HS60",
-  "manufacturer": "Yiancar-Designs",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x0257",
-    "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": "is31fl3731",
-    "max_brightness": 215
-  },
-  "matrix_pins": {
-    "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
-    "rows": ["B0", "B1", "B2", "B3", "F7"]
-  },
-  "diode_direction": "COL2ROW",
-  "qmk_lufa_bootloader": {
-    "esc_input": "B2",
-    "esc_output": "B5"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "qmk-dfu",
-  "community_layouts": ["60_ansi", "60_iso"],
-  "layouts": {
-    "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, 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": [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, 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, 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/hs60/v1/keyboard.json b/keyboards/hs60/v1/keyboard.json
new file mode 100644
index 00000000000..63fef233840
--- /dev/null
+++ b/keyboards/hs60/v1/keyboard.json
@@ -0,0 +1,221 @@
+{
+  "keyboard_name": "HS60",
+  "manufacturer": "Yiancar-Designs",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0257",
+    "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": "is31fl3731",
+    "max_brightness": 215
+  },
+  "matrix_pins": {
+    "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+    "rows": ["B0", "B1", "B2", "B3", "F7"]
+  },
+  "diode_direction": "COL2ROW",
+  "qmk_lufa_bootloader": {
+    "esc_input": "B2",
+    "esc_output": "B5"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "qmk-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "nkro": true,
+    "rgb_matrix": true,
+    "raw": true
+  },
+  "community_layouts": ["60_ansi", "60_iso"],
+  "layouts": {
+    "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, 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": [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, 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, 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/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk
index 7aa0a5ae51d..4af34f6e5bf 100644
--- a/keyboards/hs60/v1/rules.mk
+++ b/keyboards/hs60/v1/rules.mk
@@ -3,20 +3,6 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RAW_ENABLE = yes
-
 # Experimental features for zealcmd please do no enable
 #RAW_ENABLE = yes
 #USE_KEYMAPS_IN_EEPROM = yes
diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/info.json
deleted file mode 100644
index 0debcea8d1f..00000000000
--- a/keyboards/hs60/v2/ansi/info.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "keyboard_name": "HS60 V2",
-  "manufacturer": "Yiancar-Designs",
-  "url": "",
-  "maintainer": "yiancar",
-  "usb": {
-    "vid": "0x8968",
-    "pid": "0x4854",
-    "device_version": "0.0.2"
-  },
-  "matrix_pins": {
-    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
-    "rows": ["B3", "B4", "B5", "A8", "A4"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
-  "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": [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, 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, 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/hs60/v2/ansi/keyboard.json b/keyboards/hs60/v2/ansi/keyboard.json
new file mode 100644
index 00000000000..e0781ef54b5
--- /dev/null
+++ b/keyboards/hs60/v2/ansi/keyboard.json
@@ -0,0 +1,97 @@
+{
+  "keyboard_name": "HS60 V2",
+  "manufacturer": "Yiancar-Designs",
+  "url": "",
+  "maintainer": "yiancar",
+  "usb": {
+    "vid": "0x8968",
+    "pid": "0x4854",
+    "device_version": "0.0.2"
+  },
+  "matrix_pins": {
+    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
+    "rows": ["B3", "B4", "B5", "A8", "A4"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "board": "QMK_PROTON_C",
+  "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": [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, 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, 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/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk
index 96e559f742e..611bb888bac 100644
--- a/keyboards/hs60/v2/ansi/rules.mk
+++ b/keyboards/hs60/v2/ansi/rules.mk
@@ -3,18 +3,6 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-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
-AUDIO_ENABLE = no                  # Audio output
-
 CIE1931_CURVE = yes
 
 # project specific files
diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/info.json
deleted file mode 100644
index 5323fe20f01..00000000000
--- a/keyboards/hs60/v2/hhkb/info.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "keyboard_name": "HS60 V2",
-  "manufacturer": "Yiancar-Designs",
-  "url": "",
-  "maintainer": "yiancar",
-  "usb": {
-    "vid": "0x8968",
-    "pid": "0x4855",
-    "device_version": "0.0.2"
-  },
-  "matrix_pins": {
-    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
-    "rows": ["B3", "B4", "B5", "A8", "A4"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
-  "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": [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, 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/hs60/v2/hhkb/keyboard.json b/keyboards/hs60/v2/hhkb/keyboard.json
new file mode 100644
index 00000000000..d9bc040e23c
--- /dev/null
+++ b/keyboards/hs60/v2/hhkb/keyboard.json
@@ -0,0 +1,97 @@
+{
+  "keyboard_name": "HS60 V2",
+  "manufacturer": "Yiancar-Designs",
+  "url": "",
+  "maintainer": "yiancar",
+  "usb": {
+    "vid": "0x8968",
+    "pid": "0x4855",
+    "device_version": "0.0.2"
+  },
+  "matrix_pins": {
+    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
+    "rows": ["B3", "B4", "B5", "A8", "A4"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "board": "QMK_PROTON_C",
+  "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": [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, 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/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk
index 96e559f742e..611bb888bac 100644
--- a/keyboards/hs60/v2/hhkb/rules.mk
+++ b/keyboards/hs60/v2/hhkb/rules.mk
@@ -3,18 +3,6 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-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
-AUDIO_ENABLE = no                  # Audio output
-
 CIE1931_CURVE = yes
 
 # project specific files
diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/info.json
deleted file mode 100644
index c422ae2d727..00000000000
--- a/keyboards/hs60/v2/iso/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "keyboard_name": "HS60 V2",
-  "manufacturer": "Yiancar-Designs",
-  "url": "",
-  "maintainer": "yiancar",
-  "usb": {
-    "vid": "0x8968",
-    "pid": "0x4853",
-    "device_version": "0.0.2"
-  },
-  "matrix_pins": {
-    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
-    "rows": ["B3", "B4", "B5", "A8", "A4"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
-  "community_layouts": ["60_iso"],
-  "layouts": {
-    "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, 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/hs60/v2/iso/keyboard.json b/keyboards/hs60/v2/iso/keyboard.json
new file mode 100644
index 00000000000..a51dac05fa2
--- /dev/null
+++ b/keyboards/hs60/v2/iso/keyboard.json
@@ -0,0 +1,98 @@
+{
+  "keyboard_name": "HS60 V2",
+  "manufacturer": "Yiancar-Designs",
+  "url": "",
+  "maintainer": "yiancar",
+  "usb": {
+    "vid": "0x8968",
+    "pid": "0x4853",
+    "device_version": "0.0.2"
+  },
+  "matrix_pins": {
+    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
+    "rows": ["B3", "B4", "B5", "A8", "A4"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "board": "QMK_PROTON_C",
+  "community_layouts": ["60_iso"],
+  "layouts": {
+    "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, 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/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk
index 96e559f742e..611bb888bac 100644
--- a/keyboards/hs60/v2/iso/rules.mk
+++ b/keyboards/hs60/v2/iso/rules.mk
@@ -3,18 +3,6 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-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
-AUDIO_ENABLE = no                  # Audio output
-
 CIE1931_CURVE = yes
 
 # project specific files
diff --git a/keyboards/ibm/model_m/mschwingen/info.json b/keyboards/ibm/model_m/mschwingen/info.json
index ce740e4a548..0deb57ed038 100644
--- a/keyboards/ibm/model_m/mschwingen/info.json
+++ b/keyboards/ibm/model_m/mschwingen/info.json
@@ -16,6 +16,18 @@
     },
     "processor": "atmega32u4",
     "bootloader": "lufa-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "key_lock": true,
+        "dynamic_macro": true
+    },
+    "build": {
+        "lto": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ibm/model_m/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk
index 7d81ffe326b..c86801e4090 100644
--- a/keyboards/ibm/model_m/mschwingen/rules.mk
+++ b/keyboards/ibm/model_m/mschwingen/rules.mk
@@ -1,20 +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 = 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
-
 CUSTOM_MATRIX = lite
-KEY_LOCK_ENABLE = yes
-
-DYNAMIC_MACRO_ENABLE = yes
 
 UART_DEBUG = no
 
@@ -22,8 +6,6 @@ SRC += matrix.c
 UART_DRIVER_REQUIRED = yes
 SPI_DRIVER_REQUIRED = yes
 
-OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS2812 LEDs
-
-LTO_ENABLE = yes
+OPT_DEFS += -DSLEEP_LED_ENABLE
 
 DEFAULT_FOLDER = ibm/model_m/mschwingen/led_wired
diff --git a/keyboards/ibm/model_m/teensypp/info.json b/keyboards/ibm/model_m/teensypp/info.json
deleted file mode 100644
index dcbed72aebf..00000000000
--- a/keyboards/ibm/model_m/teensypp/info.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-    "keyboard_name": "IBM Model M 101/102",
-    "manufacturer": "iw0rm3r",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/teensypp",
-    "maintainer": "iw0rm3r",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2"],
-        "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "at90usb1286",
-    "bootloader": "halfkay",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-
-                {"matrix": [2, 3], "x": 2, "y": 0},
-                {"matrix": [2, 4], "x": 3, "y": 0},
-                {"matrix": [1, 4], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [1, 9], "x": 8.5, "y": 0},
-                {"matrix": [2, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [2, 6], "x": 11, "y": 0},
-                {"matrix": [3, 6], "x": 12, "y": 0},
-                {"matrix": [3, 11], "x": 13, "y": 0},
-                {"matrix": [3, 12], "x": 14, "y": 0},
-
-                {"matrix": [3, 15], "x": 15.25, "y": 0},
-                {"matrix": [4, 15], "x": 16.25, "y": 0},
-                {"matrix": [6, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 2], "x": 0, "y": 1.5},
-                {"matrix": [3, 2], "x": 1, "y": 1.5},
-                {"matrix": [3, 3], "x": 2, "y": 1.5},
-                {"matrix": [3, 4], "x": 3, "y": 1.5},
-                {"matrix": [3, 5], "x": 4, "y": 1.5},
-                {"matrix": [2, 5], "x": 5, "y": 1.5},
-                {"matrix": [2, 7], "x": 6, "y": 1.5},
-                {"matrix": [3, 7], "x": 7, "y": 1.5},
-                {"matrix": [3, 8], "x": 8, "y": 1.5},
-                {"matrix": [3, 9], "x": 9, "y": 1.5},
-                {"matrix": [3, 10], "x": 10, "y": 1.5},
-                {"matrix": [2, 10], "x": 11, "y": 1.5},
-                {"matrix": [2, 8], "x": 12, "y": 1.5},
-                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [2, 12], "x": 15.25, "y": 1.5},
-                {"matrix": [2, 14], "x": 16.25, "y": 1.5},
-                {"matrix": [2, 13], "x": 17.25, "y": 1.5},
-
-                {"matrix": [6, 11], "x": 18.5, "y": 1.5},
-                {"matrix": [6, 12], "x": 19.5, "y": 1.5},
-                {"matrix": [6, 13], "x": 20.5, "y": 1.5},
-                {"matrix": [7, 13], "x": 21.5, "y": 1.5},
-
-                {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [4, 2], "x": 1.5, "y": 2.5},
-                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
-                {"matrix": [4, 4], "x": 3.5, "y": 2.5},
-                {"matrix": [4, 5], "x": 4.5, "y": 2.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [1, 7], "x": 6.5, "y": 2.5},
-                {"matrix": [4, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [4, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [4, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [4, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [1, 10], "x": 11.5, "y": 2.5},
-                {"matrix": [1, 8], "x": 12.5, "y": 2.5},
-                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 11], "x": 15.25, "y": 2.5},
-                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-                {"matrix": [3, 13], "x": 17.25, "y": 2.5},
-
-                {"matrix": [4, 11], "x": 18.5, "y": 2.5},
-                {"matrix": [4, 12], "x": 19.5, "y": 2.5},
-                {"matrix": [4, 13], "x": 20.5, "y": 2.5},
-                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
-
-                {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.75, "y": 3.5},
-                {"matrix": [5, 3], "x": 2.75, "y": 3.5},
-                {"matrix": [5, 4], "x": 3.75, "y": 3.5},
-                {"matrix": [5, 5], "x": 4.75, "y": 3.5},
-                {"matrix": [0, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [0, 7], "x": 6.75, "y": 3.5},
-                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [5, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [0, 10], "x": 11.75, "y": 3.5},
-                {"matrix": [6, 10], "x": 12.75, "y": 3.5},
-                {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25},
-
-                {"matrix": [1, 11], "x": 18.5, "y": 3.5},
-                {"matrix": [1, 12], "x": 19.5, "y": 3.5},
-                {"matrix": [1, 13], "x": 20.5, "y": 3.5},
-
-                {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [0, 3], "x": 1.25, "y": 4.5},
-                {"matrix": [6, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [6, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [6, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [6, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 6.25, "y": 4.5},
-                {"matrix": [7, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [6, 7], "x": 8.25, "y": 4.5},
-                {"matrix": [6, 8], "x": 9.25, "y": 4.5},
-                {"matrix": [6, 9], "x": 10.25, "y": 4.5},
-                {"matrix": [7, 10], "x": 11.25, "y": 4.5},
-                {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 11], "x": 18.5, "y": 4.5},
-                {"matrix": [5, 12], "x": 19.5, "y": 4.5},
-                {"matrix": [5, 13], "x": 20.5, "y": 4.5},
-                {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [7, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [7, 11], "x": 16.25, "y": 5.5},
-                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
-
-                {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
-                {"matrix": [0, 13], "x": 20.5, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ibm/model_m/teensypp/keyboard.json b/keyboards/ibm/model_m/teensypp/keyboard.json
new file mode 100644
index 00000000000..4464a299f6d
--- /dev/null
+++ b/keyboards/ibm/model_m/teensypp/keyboard.json
@@ -0,0 +1,150 @@
+{
+    "keyboard_name": "IBM Model M 101/102",
+    "manufacturer": "iw0rm3r",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/teensypp",
+    "maintainer": "iw0rm3r",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2"],
+        "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "at90usb1286",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+
+                {"matrix": [2, 3], "x": 2, "y": 0},
+                {"matrix": [2, 4], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [1, 9], "x": 8.5, "y": 0},
+                {"matrix": [2, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 11], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+
+                {"matrix": [3, 15], "x": 15.25, "y": 0},
+                {"matrix": [4, 15], "x": 16.25, "y": 0},
+                {"matrix": [6, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 2], "x": 0, "y": 1.5},
+                {"matrix": [3, 2], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [3, 4], "x": 3, "y": 1.5},
+                {"matrix": [3, 5], "x": 4, "y": 1.5},
+                {"matrix": [2, 5], "x": 5, "y": 1.5},
+                {"matrix": [2, 7], "x": 6, "y": 1.5},
+                {"matrix": [3, 7], "x": 7, "y": 1.5},
+                {"matrix": [3, 8], "x": 8, "y": 1.5},
+                {"matrix": [3, 9], "x": 9, "y": 1.5},
+                {"matrix": [3, 10], "x": 10, "y": 1.5},
+                {"matrix": [2, 10], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 13], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 13], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 13], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 11], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 11], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [1, 11], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 12], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 13], "x": 20.5, "y": 3.5},
+
+                {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 11], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 12], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 13], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [7, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 11], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 13], "x": 20.5, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ibm/model_m/teensypp/rules.mk b/keyboards/ibm/model_m/teensypp/rules.mk
deleted file mode 100644
index 1eeda920b40..00000000000
--- a/keyboards/ibm/model_m/teensypp/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/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
deleted file mode 100644
index 37fddaaf8f1..00000000000
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "IBM Model M (4th generation)",
-    "manufacturer": "IBM/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
-    "usb": {
-        "vid": "0x16C0",
-        "pid": "0x27DB",
-        "device_version": "0.0.1"
-    },
-    "indicators": {
-        "caps_lock": "C11",
-        "num_lock": "C12",
-        "scroll_lock": "C10"
-    },
-    "processor": "STM32F446", // RET6
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // All pins in order from left-to-right, as seen on the keyboard:
-        // C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10,
-        // On this keyboard columns and rows are staggered:
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "C4", "B0", "B10", "B13", "C6", "C7", "C8", "C9"],
-        "rows": ["A7", "C5", "B1", "B12", "B14", "B15", "A8", "A9"]
-    }
-}
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..0f67e6606d7
--- /dev/null
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json
@@ -0,0 +1,35 @@
+{
+    "keyboard_name": "IBM Model M (4th generation)",
+    "manufacturer": "IBM/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "maintainer": "purdeaandrei",
+    "usb": {
+        "vid": "0x16C0",
+        "pid": "0x27DB",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+             "keyboard": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
+    "processor": "STM32F446", // RET6
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "haptic": true
+    },
+    "matrix_pins": {
+        // All pins in order from left-to-right, as seen on the keyboard:
+        // C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10,
+        // On this keyboard columns and rows are staggered:
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "C4", "B0", "B10", "B13", "C6", "C7", "C8", "C9"],
+        "rows": ["A7", "C5", "B1", "B12", "B14", "B15", "A8", "A9"]
+    }
+}
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
deleted file mode 100644
index 862b6323b02..00000000000
--- a/keyboards/ibnuda/squiggle/rev1/info.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-    "keyboard_name": "squiggle",
-    "manufacturer": "ibnuda",
-    "url": "https://github.com/ibnuda/squiggle",
-    "maintainer": "Ibnu D. Aji",
-    "usb": {
-        "vid": "0x1209",
-        "pid": "0x6969",
-        "device_version": "0.0.1"
-    },
-    "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",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.9},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [4, 4], "x": 5, "y": 0.15},
-                {"matrix": [4, 3], "x": 6, "y": 0.1},
-                {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0.2},
-                {"matrix": [4, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.9},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [5, 4], "x": 5, "y": 1.15},
-                {"matrix": [5, 3], "x": 6, "y": 1.1},
-                {"matrix": [5, 2], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1.2},
-                {"matrix": [5, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.9},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [6, 4], "x": 5, "y": 2.15},
-                {"matrix": [6, 3], "x": 6, "y": 2.1},
-                {"matrix": [6, 2], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2.2},
-                {"matrix": [6, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
-                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
-
-                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
-                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}
-            ]
-        },
-        "LAYOUT_complicated": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.9},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [4, 4], "x": 5, "y": 0.15},
-                {"matrix": [4, 3], "x": 6, "y": 0.1},
-                {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0.2},
-                {"matrix": [4, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.9},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [5, 4], "x": 5, "y": 1.15},
-                {"matrix": [5, 3], "x": 6, "y": 1.1},
-                {"matrix": [5, 2], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1.2},
-                {"matrix": [5, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.9},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [6, 4], "x": 5, "y": 2.15},
-                {"matrix": [6, 3], "x": 6, "y": 2.1},
-                {"matrix": [6, 2], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2.2},
-                {"matrix": [6, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [3, 3], "x": 3, "y": 3.6},
-                {"matrix": [3, 4], "x": 4, "y": 3.65},
-
-                {"matrix": [7, 4], "x": 5, "y": 3.65},
-                {"matrix": [7, 3], "x": 6, "y": 3.6},
-
-                {"matrix": [3, 1], "x": 3, "y": 4.6},
-                {"matrix": [3, 2], "x": 4, "y": 4.65},
-
-                {"matrix": [7, 2], "x": 5, "y": 4.65},
-                {"matrix": [7, 1], "x": 6, "y": 4.6}
-            ]
-        },
-        "LAYOUT_full": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.9},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [4, 4], "x": 5, "y": 0.15},
-                {"matrix": [4, 3], "x": 6, "y": 0.1},
-                {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0.2},
-                {"matrix": [4, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.9},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [5, 4], "x": 5, "y": 1.15},
-                {"matrix": [5, 3], "x": 6, "y": 1.1},
-                {"matrix": [5, 2], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1.2},
-                {"matrix": [5, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.9},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [6, 4], "x": 5, "y": 2.15},
-                {"matrix": [6, 3], "x": 6, "y": 2.1},
-                {"matrix": [6, 2], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2.2},
-                {"matrix": [6, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.9},
-                {"matrix": [3, 1], "x": 1, "y": 3.2},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3.1},
-                {"matrix": [3, 4], "x": 4, "y": 3.15},
-
-                {"matrix": [7, 4], "x": 5, "y": 3.15},
-                {"matrix": [7, 3], "x": 6, "y": 3.1},
-                {"matrix": [7, 2], "x": 7, "y": 3},
-                {"matrix": [7, 1], "x": 8, "y": 3.2},
-                {"matrix": [7, 0], "x": 9, "y": 3.9}
-            ]
-        },
-        "LAYOUT_reversed": {
-            "layout": [
-                {"matrix": [4, 0], "x": 0, "y": 0.9},
-                {"matrix": [4, 1], "x": 1, "y": 0.2},
-                {"matrix": [4, 2], "x": 2, "y": 0},
-                {"matrix": [4, 3], "x": 3, "y": 0.1},
-                {"matrix": [4, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [0, 4], "x": 5, "y": 0.15},
-                {"matrix": [0, 3], "x": 6, "y": 0.1},
-                {"matrix": [0, 2], "x": 7, "y": 0},
-                {"matrix": [0, 1], "x": 8, "y": 0.2},
-                {"matrix": [0, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [5, 0], "x": 0, "y": 1.9},
-                {"matrix": [5, 1], "x": 1, "y": 1.2},
-                {"matrix": [5, 2], "x": 2, "y": 1},
-                {"matrix": [5, 3], "x": 3, "y": 1.1},
-                {"matrix": [5, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [1, 4], "x": 5, "y": 1.15},
-                {"matrix": [1, 3], "x": 6, "y": 1.1},
-                {"matrix": [1, 2], "x": 7, "y": 1},
-                {"matrix": [1, 1], "x": 8, "y": 1.2},
-                {"matrix": [1, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [6, 0], "x": 0, "y": 2.9},
-                {"matrix": [6, 1], "x": 1, "y": 2.2},
-                {"matrix": [6, 2], "x": 2, "y": 2},
-                {"matrix": [6, 3], "x": 3, "y": 2.1},
-                {"matrix": [6, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [2, 4], "x": 5, "y": 2.15},
-                {"matrix": [2, 3], "x": 6, "y": 2.1},
-                {"matrix": [2, 2], "x": 7, "y": 2},
-                {"matrix": [2, 1], "x": 8, "y": 2.2},
-                {"matrix": [2, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [7, 3], "x": 3, "y": 3.6, "h": 2},
-                {"matrix": [7, 4], "x": 4, "y": 3.65, "h": 2},
-
-                {"matrix": [3, 4], "x": 5, "y": 3.65, "h": 2},
-                {"matrix": [3, 3], "x": 6, "y": 3.6, "h": 2}
-            ]
-        },
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.9},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [4, 4], "x": 5, "y": 0.15},
-                {"matrix": [4, 3], "x": 6, "y": 0.1},
-                {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0.2},
-                {"matrix": [4, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.9},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [5, 4], "x": 5, "y": 1.15},
-                {"matrix": [5, 3], "x": 6, "y": 1.1},
-                {"matrix": [5, 2], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1.2},
-                {"matrix": [5, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.9},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [6, 4], "x": 5, "y": 2.15},
-                {"matrix": [6, 3], "x": 6, "y": 2.1},
-                {"matrix": [6, 2], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2.2},
-                {"matrix": [6, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25},
-                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
-                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
-
-                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
-                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2},
-                {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25}
-            ]
-        },
-        "LAYOUT_thumbrow": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.9},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [4, 4], "x": 5, "y": 0.15},
-                {"matrix": [4, 3], "x": 6, "y": 0.1},
-                {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0.2},
-                {"matrix": [4, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.9},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [5, 4], "x": 5, "y": 1.15},
-                {"matrix": [5, 3], "x": 6, "y": 1.1},
-                {"matrix": [5, 2], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1.2},
-                {"matrix": [5, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.9},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [6, 4], "x": 5, "y": 2.15},
-                {"matrix": [6, 3], "x": 6, "y": 2.1},
-                {"matrix": [6, 2], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2.2},
-                {"matrix": [6, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [3, 1], "x": 3, "y": 4.6},
-                {"matrix": [3, 2], "x": 4, "y": 4.65},
-                {"matrix": [3, 3], "x": 3, "y": 3.6},
-                {"matrix": [3, 4], "x": 4, "y": 3.65},
-
-                {"matrix": [7, 4], "x": 5, "y": 3.65},
-                {"matrix": [7, 3], "x": 6, "y": 3.6},
-                {"matrix": [7, 2], "x": 5, "y": 4.65},
-                {"matrix": [7, 1], "x": 6, "y": 4.6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ibnuda/squiggle/rev1/keyboard.json b/keyboards/ibnuda/squiggle/rev1/keyboard.json
new file mode 100644
index 00000000000..3baafefc841
--- /dev/null
+++ b/keyboards/ibnuda/squiggle/rev1/keyboard.json
@@ -0,0 +1,319 @@
+{
+    "keyboard_name": "squiggle",
+    "manufacturer": "ibnuda",
+    "url": "https://github.com/ibnuda/squiggle",
+    "maintainer": "Ibnu D. Aji",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x6969",
+        "device_version": "0.0.1"
+    },
+    "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",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}
+            ]
+        },
+        "LAYOUT_complicated": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.6},
+                {"matrix": [3, 4], "x": 4, "y": 3.65},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65},
+                {"matrix": [7, 3], "x": 6, "y": 3.6},
+
+                {"matrix": [3, 1], "x": 3, "y": 4.6},
+                {"matrix": [3, 2], "x": 4, "y": 4.65},
+
+                {"matrix": [7, 2], "x": 5, "y": 4.65},
+                {"matrix": [7, 1], "x": 6, "y": 4.6}
+            ]
+        },
+        "LAYOUT_full": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.9},
+                {"matrix": [3, 1], "x": 1, "y": 3.2},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.1},
+                {"matrix": [3, 4], "x": 4, "y": 3.15},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.15},
+                {"matrix": [7, 3], "x": 6, "y": 3.1},
+                {"matrix": [7, 2], "x": 7, "y": 3},
+                {"matrix": [7, 1], "x": 8, "y": 3.2},
+                {"matrix": [7, 0], "x": 9, "y": 3.9}
+            ]
+        },
+        "LAYOUT_reversed": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0.9},
+                {"matrix": [4, 1], "x": 1, "y": 0.2},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0.1},
+                {"matrix": [4, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [0, 4], "x": 5, "y": 0.15},
+                {"matrix": [0, 3], "x": 6, "y": 0.1},
+                {"matrix": [0, 2], "x": 7, "y": 0},
+                {"matrix": [0, 1], "x": 8, "y": 0.2},
+                {"matrix": [0, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [5, 0], "x": 0, "y": 1.9},
+                {"matrix": [5, 1], "x": 1, "y": 1.2},
+                {"matrix": [5, 2], "x": 2, "y": 1},
+                {"matrix": [5, 3], "x": 3, "y": 1.1},
+                {"matrix": [5, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [1, 4], "x": 5, "y": 1.15},
+                {"matrix": [1, 3], "x": 6, "y": 1.1},
+                {"matrix": [1, 2], "x": 7, "y": 1},
+                {"matrix": [1, 1], "x": 8, "y": 1.2},
+                {"matrix": [1, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [6, 0], "x": 0, "y": 2.9},
+                {"matrix": [6, 1], "x": 1, "y": 2.2},
+                {"matrix": [6, 2], "x": 2, "y": 2},
+                {"matrix": [6, 3], "x": 3, "y": 2.1},
+                {"matrix": [6, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [2, 4], "x": 5, "y": 2.15},
+                {"matrix": [2, 3], "x": 6, "y": 2.1},
+                {"matrix": [2, 2], "x": 7, "y": 2},
+                {"matrix": [2, 1], "x": 8, "y": 2.2},
+                {"matrix": [2, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [7, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [7, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [3, 3], "x": 6, "y": 3.6, "h": 2}
+            ]
+        },
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2},
+                {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25}
+            ]
+        },
+        "LAYOUT_thumbrow": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 1], "x": 3, "y": 4.6},
+                {"matrix": [3, 2], "x": 4, "y": 4.65},
+                {"matrix": [3, 3], "x": 3, "y": 3.6},
+                {"matrix": [3, 4], "x": 4, "y": 3.65},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65},
+                {"matrix": [7, 3], "x": 6, "y": 3.6},
+                {"matrix": [7, 2], "x": 5, "y": 4.65},
+                {"matrix": [7, 1], "x": 6, "y": 4.6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ibnuda/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk
deleted file mode 100644
index 2382d570350..00000000000
--- a/keyboards/ibnuda/squiggle/rev1/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 = 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/idobao/id42/info.json b/keyboards/idobao/id42/info.json
deleted file mode 100644
index ace2033493b..00000000000
--- a/keyboards/idobao/id42/info.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "Abacus ID42",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": false,
-        "command": false,
-        "nkro": true
-    },
-    "ws2812": {
-        "pin": "B3"
-    },
-    "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,
-            "rainbow_moving_chevron": 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,
-            "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": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"],
-        "rows": ["D5", "C6", "B6", "E6"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=ID42*",
-    "usb": {
-        "vid": "0x6964",
-        "pid": "0x0042",
-        "device_version": "1.0.0",
-        "force_nkro": true,
-        "polling_interval": 2
-      },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
-                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
-                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
-                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
-                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
-                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
-                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
-                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
-                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
-                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
-                {"matrix": [0, 11], "label": "BSpc", "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
-                {"matrix": [1, 11], "label": "Ent", "x": 10.25, "y": 1, "w": 1.75},
-
-                {"matrix": [2, 0], "label": "Shft", "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "label": "Shft", "x": 8.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 10], "label": "\u21E7", "x": 10, "y": 2},
-                {"matrix": [2, 11], "label": "Del", "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "label": "Alt", "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "label": "", "x": 3.5, "y": 3, "w": 2.75},
-                {"matrix": [3, 6], "label": "Fn", "x": 6.25, "y": 3, "w": 2.75},
-                {"matrix": [3, 9], "label": "\u21E6", "x": 9, "y": 3},
-                {"matrix": [3, 10], "label": "\u21E9", "x": 10, "y": 3},
-                {"matrix": [3, 11], "label": "\u21E8", "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id42/keyboard.json b/keyboards/idobao/id42/keyboard.json
new file mode 100644
index 00000000000..14db7641eab
--- /dev/null
+++ b/keyboards/idobao/id42/keyboard.json
@@ -0,0 +1,128 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "Abacus ID42",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "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,
+            "rainbow_moving_chevron": 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,
+            "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": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"],
+        "rows": ["D5", "C6", "B6", "E6"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=ID42*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0042",
+        "device_version": "1.0.0",
+        "force_nkro": true,
+        "polling_interval": 2
+      },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "BSpc", "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "label": "Ent", "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "label": "Shft", "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "Shft", "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 10], "label": "\u21E7", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "Del", "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "label": "", "x": 3.5, "y": 3, "w": 2.75},
+                {"matrix": [3, 6], "label": "Fn", "x": 6.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "label": "\u21E6", "x": 9, "y": 3},
+                {"matrix": [3, 10], "label": "\u21E9", "x": 10, "y": 3},
+                {"matrix": [3, 11], "label": "\u21E8", "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id42/rules.mk b/keyboards/idobao/id42/rules.mk
deleted file mode 100755
index 58e39b17a55..00000000000
--- a/keyboards/idobao/id42/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file intentionally left blank
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json
deleted file mode 100644
index 0b1c51279de..00000000000
--- a/keyboards/idobao/id61/info.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "ID61",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": 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,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "rainbow_moving_chevron": 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,
-            "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": 170,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"],
-        "rows": ["B0", "B1", "B2", "B3", "F7"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=id61*",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0061",
-        "vid": "0x6964"
-    },
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id61/keyboard.json b/keyboards/idobao/id61/keyboard.json
new file mode 100644
index 00000000000..cb55f1750dd
--- /dev/null
+++ b/keyboards/idobao/id61/keyboard.json
@@ -0,0 +1,147 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "ID61",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "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,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": 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,
+            "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": 170,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=id61*",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0061",
+        "vid": "0x6964"
+    },
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id61/rules.mk b/keyboards/idobao/id61/rules.mk
deleted file mode 100644
index ed51a576218..00000000000
--- a/keyboards/idobao/id61/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2022 Vino Rodrigues (@vinorodrigues)
-# SPDX-License-Identifier: GPL-2.0-or-later
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json
deleted file mode 100644
index 573fb440303..00000000000
--- a/keyboards/idobao/id63/info.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "ID63",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "rainbow_moving_chevron": 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,
-            "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": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
-        "rows": ["B0", "B1", "B2", "E6", "F7"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=id63*",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0063",
-        "vid": "0x6964"
-    },
-    "layout_aliases": {
-        "LAYOUT_63_ansi": "LAYOUT_60_ansi_arrow"
-    },
-    "community_layouts": ["60_ansi_arrow"],
-    "layouts": {
-        "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], "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], "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, 11], "x": 11.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 12], "x": 13, "y": 3},
-                {"label": "/?", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "\u2190", "matrix": [4, 11], "x": 12, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id63/keyboard.json b/keyboards/idobao/id63/keyboard.json
new file mode 100644
index 00000000000..1969ca4cf75
--- /dev/null
+++ b/keyboards/idobao/id63/keyboard.json
@@ -0,0 +1,152 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "ID63",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": 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,
+            "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": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
+        "rows": ["B0", "B1", "B2", "E6", "F7"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=id63*",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0063",
+        "vid": "0x6964"
+    },
+    "layout_aliases": {
+        "LAYOUT_63_ansi": "LAYOUT_60_ansi_arrow"
+    },
+    "community_layouts": ["60_ansi_arrow"],
+    "layouts": {
+        "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], "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], "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, 11], "x": 11.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 12], "x": 13, "y": 3},
+                {"label": "/?", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "\u2190", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id63/rules.mk b/keyboards/idobao/id63/rules.mk
deleted file mode 100644
index 58e39b17a55..00000000000
--- a/keyboards/idobao/id63/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file intentionally left blank
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
deleted file mode 100644
index 7c5308d3156..00000000000
--- a/keyboards/idobao/id67/info.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "ID67",
-    "maintainer": "thewerther",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": false,
-        "console": false,
-        "nkro": 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,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "rainbow_moving_chevron": 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,
-            "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": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
-        "rows": ["B0", "B1", "B2", "B3", "F7"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=ID67*",
-    "usb": {
-        "vid": "0x6964",
-        "pid": "0x0267",
-        "device_version": "2.0.0"
-    },
-    "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, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 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, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id67/keyboard.json b/keyboards/idobao/id67/keyboard.json
new file mode 100644
index 00000000000..64c3623fd69
--- /dev/null
+++ b/keyboards/idobao/id67/keyboard.json
@@ -0,0 +1,152 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "ID67",
+    "maintainer": "thewerther",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": false,
+        "console": 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,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": 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,
+            "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": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=ID67*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0267",
+        "device_version": "2.0.0"
+    },
+    "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, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id67/rules.mk b/keyboards/idobao/id67/rules.mk
deleted file mode 100644
index 4341508fde4..00000000000
--- a/keyboards/idobao/id67/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix feature
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
deleted file mode 100644
index 19dc8c67a70..00000000000
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "IDOBAO ID80v3",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": false,
-        "command": false,
-        "nkro": 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,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "rainbow_moving_chevron": 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,
-            "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": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
-        "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=id80*",
-    "usb": {
-        "vid": "0x6964",
-        "pid": "0x0380",
-        "device_version": "3.0.0"
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "bootmagic": {
-        "matrix": [0, 5]
-    },
-    "layouts": {
-        "LAYOUT_80_ansi": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0},
-                {"matrix": [1, 5], "x": 1.25, "y": 0},
-                {"matrix": [2, 5], "x": 2.25, "y": 0},
-                {"matrix": [3, 5], "x": 3.25, "y": 0},
-                {"matrix": [4, 5], "x": 4.25, "y": 0},
-                {"matrix": [5, 5], "x": 5.5, "y": 0},
-                {"matrix": [6, 5], "x": 6.5, "y": 0},
-                {"matrix": [7, 5], "x": 7.5, "y": 0},
-                {"matrix": [8, 5], "x": 8.5, "y": 0},
-                {"matrix": [7, 10], "x": 9.75, "y": 0},
-                {"matrix": [5, 10], "x": 10.75, "y": 0},
-                {"matrix": [4, 10], "x": 11.75, "y": 0},
-                {"matrix": [3, 10], "x": 12.75, "y": 0},
-                {"matrix": [6, 10], "x": 14, "y": 0},
-                {"matrix": [2, 10], "x": 15.25, "y": 0},
-
-                {"matrix": [0, 4], "x": 0, "y": 1.25},
-                {"matrix": [1, 4], "x": 1, "y": 1.25},
-                {"matrix": [2, 4], "x": 2, "y": 1.25},
-                {"matrix": [3, 4], "x": 3, "y": 1.25},
-                {"matrix": [4, 4], "x": 4, "y": 1.25},
-                {"matrix": [5, 4], "x": 5, "y": 1.25},
-                {"matrix": [6, 4], "x": 6, "y": 1.25},
-                {"matrix": [7, 4], "x": 7, "y": 1.25},
-                {"matrix": [8, 4], "x": 8, "y": 1.25},
-                {"matrix": [8, 9], "x": 9, "y": 1.25},
-                {"matrix": [7, 9], "x": 10, "y": 1.25},
-                {"matrix": [5, 9], "x": 11, "y": 1.25},
-                {"matrix": [4, 9], "x": 12, "y": 1.25},
-                {"matrix": [6, 9], "x": 13, "y": 1.25, "w": 2},
-                {"matrix": [2, 9], "x": 15.25, "y": 1.25},
-
-                {"matrix": [0, 3], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 5.5, "y": 2.25},
-                {"matrix": [6, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [7, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [8, 3], "x": 8.5, "y": 2.25},
-                {"matrix": [8, 8], "x": 9.5, "y": 2.25},
-                {"matrix": [7, 8], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 8], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 8], "x": 12.5, "y": 2.25},
-                {"matrix": [3, 8], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
-
-                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [1, 2], "x": 1.75, "y": 3.25},
-                {"matrix": [2, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
-                {"matrix": [4, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [5, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 7.75, "y": 3.25},
-                {"matrix": [8, 2], "x": 8.75, "y": 3.25},
-                {"matrix": [8, 7], "x": 9.75, "y": 3.25},
-                {"matrix": [7, 7], "x": 10.75, "y": 3.25},
-                {"matrix": [5, 7], "x": 11.75, "y": 3.25},
-                {"matrix": [4, 7], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [2, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [3, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 1], "x": 4.25, "y": 4.25},
-                {"matrix": [5, 1], "x": 5.25, "y": 4.25},
-                {"matrix": [6, 1], "x": 6.25, "y": 4.25},
-                {"matrix": [7, 1], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 1], "x": 8.25, "y": 4.25},
-                {"matrix": [8, 6], "x": 9.25, "y": 4.25},
-                {"matrix": [7, 6], "x": 10.25, "y": 4.25},
-                {"matrix": [5, 6], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [3, 6], "x": 14.25, "y": 4.5},
-
-                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 0], "x": 13.25, "y": 5.5},
-                {"matrix": [4, 0], "x": 14.25, "y": 5.5},
-                {"matrix": [3, 0], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id80/v3/ansi/keyboard.json b/keyboards/idobao/id80/v3/ansi/keyboard.json
new file mode 100644
index 00000000000..6200c2e88c9
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/keyboard.json
@@ -0,0 +1,171 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "IDOBAO ID80v3",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": 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,
+            "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": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=id80*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0380",
+        "device_version": "3.0.0"
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
+    "layouts": {
+        "LAYOUT_80_ansi": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0},
+                {"matrix": [1, 5], "x": 1.25, "y": 0},
+                {"matrix": [2, 5], "x": 2.25, "y": 0},
+                {"matrix": [3, 5], "x": 3.25, "y": 0},
+                {"matrix": [4, 5], "x": 4.25, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [6, 5], "x": 6.5, "y": 0},
+                {"matrix": [7, 5], "x": 7.5, "y": 0},
+                {"matrix": [8, 5], "x": 8.5, "y": 0},
+                {"matrix": [7, 10], "x": 9.75, "y": 0},
+                {"matrix": [5, 10], "x": 10.75, "y": 0},
+                {"matrix": [4, 10], "x": 11.75, "y": 0},
+                {"matrix": [3, 10], "x": 12.75, "y": 0},
+                {"matrix": [6, 10], "x": 14, "y": 0},
+                {"matrix": [2, 10], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 4], "x": 0, "y": 1.25},
+                {"matrix": [1, 4], "x": 1, "y": 1.25},
+                {"matrix": [2, 4], "x": 2, "y": 1.25},
+                {"matrix": [3, 4], "x": 3, "y": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 1.25},
+                {"matrix": [5, 4], "x": 5, "y": 1.25},
+                {"matrix": [6, 4], "x": 6, "y": 1.25},
+                {"matrix": [7, 4], "x": 7, "y": 1.25},
+                {"matrix": [8, 4], "x": 8, "y": 1.25},
+                {"matrix": [8, 9], "x": 9, "y": 1.25},
+                {"matrix": [7, 9], "x": 10, "y": 1.25},
+                {"matrix": [5, 9], "x": 11, "y": 1.25},
+                {"matrix": [4, 9], "x": 12, "y": 1.25},
+                {"matrix": [6, 9], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 9], "x": 15.25, "y": 1.25},
+
+                {"matrix": [0, 3], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 8.5, "y": 2.25},
+                {"matrix": [8, 8], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 8], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 8], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 8], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
+
+                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [1, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [5, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 7], "x": 10.75, "y": 3.25},
+                {"matrix": [5, 7], "x": 11.75, "y": 3.25},
+                {"matrix": [4, 7], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [5, 1], "x": 5.25, "y": 4.25},
+                {"matrix": [6, 1], "x": 6.25, "y": 4.25},
+                {"matrix": [7, 1], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 6], "x": 10.25, "y": 4.25},
+                {"matrix": [5, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [3, 6], "x": 14.25, "y": 4.5},
+
+                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 0], "x": 13.25, "y": 5.5},
+                {"matrix": [4, 0], "x": 14.25, "y": 5.5},
+                {"matrix": [3, 0], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id80/v3/ansi/rules.mk b/keyboards/idobao/id80/v3/ansi/rules.mk
deleted file mode 100644
index 58e39b17a55..00000000000
--- a/keyboards/idobao/id80/v3/ansi/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file intentionally left blank
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
deleted file mode 100644
index 4a6099207c2..00000000000
--- a/keyboards/idobao/id87/v2/info.json
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "ID87v2",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "ROW2COL",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": false,
-        "command": false,
-        "nkro": true
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "rainbow_moving_chevron": 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,
-            "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": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
-        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=ID87*",
-    "usb": {
-        "vid": "0x6964",
-        "pid": "0x0287",
-        "device_version": "2.0.0"
-    },
-    "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": [6, 8], "x": 9.5, "y": 0},
-                {"matrix": [6, 7], "x": 11, "y": 0},
-                {"matrix": [6, 5], "x": 12, "y": 0},
-                {"matrix": [6, 4], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 6], "x": 15.25, "y": 0},
-                {"matrix": [6, 2], "x": 16.25, "y": 0},
-                {"matrix": [6, 1], "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": [7, 8], "x": 9, "y": 1.25},
-                {"matrix": [7, 0], "x": 10, "y": 1.25},
-                {"matrix": [7, 7], "x": 11, "y": 1.25},
-                {"matrix": [7, 5], "x": 12, "y": 1.25},
-                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
-                {"matrix": [7, 6], "x": 15.25, "y": 1.25},
-                {"matrix": [7, 2], "x": 16.25, "y": 1.25},
-                {"matrix": [7, 1], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
-                {"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": [8, 8], "x": 9.5, "y": 2.25},
-                {"matrix": [8, 7], "x": 10.5, "y": 2.25},
-                {"matrix": [8, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [8, 4], "x": 12.5, "y": 2.25},
-                {"matrix": [8, 3], "w": 1.5, "x": 13.5, "y": 2.25},
-                {"matrix": [8, 6], "x": 15.25, "y": 2.25},
-                {"matrix": [8, 2], "x": 16.25, "y": 2.25},
-                {"matrix": [8, 1], "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": [9, 8], "x": 9.75, "y": 3.25},
-                {"matrix": [9, 7], "x": 10.75, "y": 3.25},
-                {"matrix": [9, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [9, 3], "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": [10, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [10, 7], "x": 10.25, "y": 4.25},
-                {"matrix": [10, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [10, 4], "x": 12.25, "y": 4.25, "w": 2.75},
-                {"matrix": [9, 2], "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, 8], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 7], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 6], "x": 15.25, "y": 5.25},
-                {"matrix": [10, 2], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 1], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id87/v2/keyboard.json b/keyboards/idobao/id87/v2/keyboard.json
new file mode 100644
index 00000000000..0ece932274f
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keyboard.json
@@ -0,0 +1,173 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "ID87v2",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": 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,
+            "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": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=ID87*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0287",
+        "device_version": "2.0.0"
+    },
+    "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": [6, 8], "x": 9.5, "y": 0},
+                {"matrix": [6, 7], "x": 11, "y": 0},
+                {"matrix": [6, 5], "x": 12, "y": 0},
+                {"matrix": [6, 4], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+                {"matrix": [6, 6], "x": 15.25, "y": 0},
+                {"matrix": [6, 2], "x": 16.25, "y": 0},
+                {"matrix": [6, 1], "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": [7, 8], "x": 9, "y": 1.25},
+                {"matrix": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 7], "x": 11, "y": 1.25},
+                {"matrix": [7, 5], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [7, 6], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 2], "x": 16.25, "y": 1.25},
+                {"matrix": [7, 1], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
+                {"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": [8, 8], "x": 9.5, "y": 2.25},
+                {"matrix": [8, 7], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 4], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "w": 1.5, "x": 13.5, "y": 2.25},
+                {"matrix": [8, 6], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 2], "x": 16.25, "y": 2.25},
+                {"matrix": [8, 1], "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": [9, 8], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 7], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 3], "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": [10, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [10, 7], "x": 10.25, "y": 4.25},
+                {"matrix": [10, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [10, 4], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [9, 2], "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, 8], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 2], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 1], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id87/v2/rules.mk b/keyboards/idobao/id87/v2/rules.mk
deleted file mode 100644
index 58e39b17a55..00000000000
--- a/keyboards/idobao/id87/v2/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file intentionally left blank
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json
deleted file mode 100755
index 37bcea51260..00000000000
--- a/keyboards/idobao/montex/v2/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "Montex ID27v2",
-    "maintainer": "IBNobody",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "ROW2COL",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "ws2812": {
-        "pin": "B1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "cycle_out_in": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "rainbow_beacon": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "splash": true,
-            "solid_splash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D3", "D2", "D1", "D0"],
-        "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=montex*",
-    "usb": {
-        "device_version": "2.0.0",
-        "pid": "0x0227",
-        "vid": "0x6964"
-    },
-    "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},
-                {"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, "h": 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},
-                {"matrix": [5, 3], "x": 4, "y": 4, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5, "w": 2},
-                {"matrix": [5, 2], "x": 3, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/montex/v2/keyboard.json b/keyboards/idobao/montex/v2/keyboard.json
new file mode 100755
index 00000000000..6ff0ee23a31
--- /dev/null
+++ b/keyboards/idobao/montex/v2/keyboard.json
@@ -0,0 +1,99 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "Montex ID27v2",
+    "maintainer": "IBNobody",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0"],
+        "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=montex*",
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x0227",
+        "vid": "0x6964"
+    },
+    "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},
+                {"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, "h": 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},
+                {"matrix": [5, 3], "x": 4, "y": 4, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 3, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v2/rules.mk
deleted file mode 100755
index d249ac15a7c..00000000000
--- a/keyboards/idobao/montex/v2/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file intentionally mostly left blank
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json
deleted file mode 100644
index d9259d5f322..00000000000
--- a/keyboards/ingrained/info.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "keyboard_name": "ingrained",
-    "manufacturer": "s8erdude",
-    "url": "https://github.com/jpuerto96",
-    "maintainer": "jpuerto96 (s8erdude)",
-    "usb": {
-        "vid": "0xB33F",
-        "pid": "0x58E4",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["split_3x5_3", "split_3x6_3"],
-    "layouts": {
-        "LAYOUT_split_3x6_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.3},
-                {"matrix": [0, 1], "x": 1, "y": 0.3},
-                {"matrix": [0, 2], "x": 2, "y": 0.1},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.1},
-                {"matrix": [0, 5], "x": 5, "y": 0.2},
-
-                {"matrix": [4, 5], "x": 9, "y": 0.2},
-                {"matrix": [4, 4], "x": 10, "y": 0.1},
-                {"matrix": [4, 3], "x": 11, "y": 0},
-                {"matrix": [4, 2], "x": 12, "y": 0.1},
-                {"matrix": [4, 1], "x": 13, "y": 0.3},
-                {"matrix": [4, 0], "x": 14, "y": 0.3},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.3},
-                {"matrix": [1, 1], "x": 1, "y": 1.3},
-                {"matrix": [1, 2], "x": 2, "y": 1.1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.1},
-                {"matrix": [1, 5], "x": 5, "y": 1.2},
-
-                {"matrix": [5, 5], "x": 9, "y": 1.2},
-                {"matrix": [5, 4], "x": 10, "y": 1.1},
-                {"matrix": [5, 3], "x": 11, "y": 1},
-                {"matrix": [5, 2], "x": 12, "y": 1.1},
-                {"matrix": [5, 1], "x": 13, "y": 1.3},
-                {"matrix": [5, 0], "x": 14, "y": 1.3},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.3},
-                {"matrix": [2, 1], "x": 1, "y": 2.3},
-                {"matrix": [2, 2], "x": 2, "y": 2.1},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.1},
-                {"matrix": [2, 5], "x": 5, "y": 2.2},
-
-                {"matrix": [6, 5], "x": 9, "y": 2.2},
-                {"matrix": [6, 4], "x": 10, "y": 2.1},
-                {"matrix": [6, 3], "x": 11, "y": 2},
-                {"matrix": [6, 2], "x": 12, "y": 2.1},
-                {"matrix": [6, 1], "x": 13, "y": 2.3},
-                {"matrix": [6, 0], "x": 14, "y": 2.3},
-
-                {"matrix": [3, 3], "x": 4, "y": 3.7},
-                {"matrix": [3, 4], "x": 5, "y": 3.7},
-                {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
-
-                {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
-                {"matrix": [7, 4], "x": 9, "y": 3.7},
-                {"matrix": [7, 3], "x": 10, "y": 3.7}
-            ]
-        },
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 1], "x": 0, "y": 0.3},
-                {"matrix": [0, 2], "x": 1, "y": 0.1},
-                {"matrix": [0, 3], "x": 2, "y": 0},
-                {"matrix": [0, 4], "x": 3, "y": 0.1},
-                {"matrix": [0, 5], "x": 4, "y": 0.2},
-
-                {"matrix": [4, 5], "x": 8, "y": 0.2},
-                {"matrix": [4, 4], "x": 9, "y": 0.1},
-                {"matrix": [4, 3], "x": 10, "y": 0},
-                {"matrix": [4, 2], "x": 11, "y": 0.1},
-                {"matrix": [4, 1], "x": 12, "y": 0.3},
-
-                {"matrix": [1, 1], "x": 0, "y": 1.3},
-                {"matrix": [1, 2], "x": 1, "y": 1.1},
-                {"matrix": [1, 3], "x": 2, "y": 1},
-                {"matrix": [1, 4], "x": 3, "y": 1.1},
-                {"matrix": [1, 5], "x": 4, "y": 1.2},
-
-                {"matrix": [5, 5], "x": 8, "y": 1.2},
-                {"matrix": [5, 4], "x": 9, "y": 1.1},
-                {"matrix": [5, 3], "x": 10, "y": 1},
-                {"matrix": [5, 2], "x": 11, "y": 1.1},
-                {"matrix": [5, 1], "x": 12, "y": 1.3},
-
-                {"matrix": [2, 1], "x": 0, "y": 2.3},
-                {"matrix": [2, 2], "x": 1, "y": 2.1},
-                {"matrix": [2, 3], "x": 2, "y": 2},
-                {"matrix": [2, 4], "x": 3, "y": 2.1},
-                {"matrix": [2, 5], "x": 4, "y": 2.2},
-
-                {"matrix": [6, 5], "x": 8, "y": 2.2},
-                {"matrix": [6, 4], "x": 9, "y": 2.1},
-                {"matrix": [6, 3], "x": 10, "y": 2},
-                {"matrix": [6, 2], "x": 11, "y": 2.1},
-                {"matrix": [6, 1], "x": 12, "y": 2.3},
-
-                {"matrix": [3, 3], "x": 3, "y": 3.7},
-                {"matrix": [3, 4], "x": 4, "y": 3.7},
-                {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
-
-                {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
-                {"matrix": [7, 4], "x": 8, "y": 3.7},
-                {"matrix": [7, 3], "x": 9, "y": 3.7}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ingrained/keyboard.json b/keyboards/ingrained/keyboard.json
new file mode 100644
index 00000000000..ec6422fb0ff
--- /dev/null
+++ b/keyboards/ingrained/keyboard.json
@@ -0,0 +1,126 @@
+{
+    "keyboard_name": "ingrained",
+    "manufacturer": "s8erdude",
+    "url": "https://github.com/jpuerto96",
+    "maintainer": "jpuerto96 (s8erdude)",
+    "usb": {
+        "vid": "0xB33F",
+        "pid": "0x58E4",
+        "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_3", "split_3x6_3"],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.3},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.2},
+
+                {"matrix": [4, 5], "x": 9, "y": 0.2},
+                {"matrix": [4, 4], "x": 10, "y": 0.1},
+                {"matrix": [4, 3], "x": 11, "y": 0},
+                {"matrix": [4, 2], "x": 12, "y": 0.1},
+                {"matrix": [4, 1], "x": 13, "y": 0.3},
+                {"matrix": [4, 0], "x": 14, "y": 0.3},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.3},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.2},
+
+                {"matrix": [5, 5], "x": 9, "y": 1.2},
+                {"matrix": [5, 4], "x": 10, "y": 1.1},
+                {"matrix": [5, 3], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1.1},
+                {"matrix": [5, 1], "x": 13, "y": 1.3},
+                {"matrix": [5, 0], "x": 14, "y": 1.3},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.3},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.2},
+
+                {"matrix": [6, 5], "x": 9, "y": 2.2},
+                {"matrix": [6, 4], "x": 10, "y": 2.1},
+                {"matrix": [6, 3], "x": 11, "y": 2},
+                {"matrix": [6, 2], "x": 12, "y": 2.1},
+                {"matrix": [6, 1], "x": 13, "y": 2.3},
+                {"matrix": [6, 0], "x": 14, "y": 2.3},
+
+                {"matrix": [3, 3], "x": 4, "y": 3.7},
+                {"matrix": [3, 4], "x": 5, "y": 3.7},
+                {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
+
+                {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
+                {"matrix": [7, 4], "x": 9, "y": 3.7},
+                {"matrix": [7, 3], "x": 10, "y": 3.7}
+            ]
+        },
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 0.3},
+                {"matrix": [0, 2], "x": 1, "y": 0.1},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0.1},
+                {"matrix": [0, 5], "x": 4, "y": 0.2},
+
+                {"matrix": [4, 5], "x": 8, "y": 0.2},
+                {"matrix": [4, 4], "x": 9, "y": 0.1},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0.1},
+                {"matrix": [4, 1], "x": 12, "y": 0.3},
+
+                {"matrix": [1, 1], "x": 0, "y": 1.3},
+                {"matrix": [1, 2], "x": 1, "y": 1.1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1.1},
+                {"matrix": [1, 5], "x": 4, "y": 1.2},
+
+                {"matrix": [5, 5], "x": 8, "y": 1.2},
+                {"matrix": [5, 4], "x": 9, "y": 1.1},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1.1},
+                {"matrix": [5, 1], "x": 12, "y": 1.3},
+
+                {"matrix": [2, 1], "x": 0, "y": 2.3},
+                {"matrix": [2, 2], "x": 1, "y": 2.1},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2.1},
+                {"matrix": [2, 5], "x": 4, "y": 2.2},
+
+                {"matrix": [6, 5], "x": 8, "y": 2.2},
+                {"matrix": [6, 4], "x": 9, "y": 2.1},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2.1},
+                {"matrix": [6, 1], "x": 12, "y": 2.3},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.7},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
+
+                {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 3.7},
+                {"matrix": [7, 3], "x": 9, "y": 3.7}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ingrained/rules.mk b/keyboards/ingrained/rules.mk
index e9a8002f902..c04c3c92ed3 100644
--- a/keyboards/ingrained/rules.mk
+++ b/keyboards/ingrained/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/inland/kb83/info.json b/keyboards/inland/kb83/info.json
deleted file mode 100644
index b4396fb630e..00000000000
--- a/keyboards/inland/kb83/info.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-    "keyboard_name": "KB83",
-    "manufacturer": "www.hfd.cn",
-    "maintainer": "hfd",
-    "usb": {
-        "vid": "0xFFFE",
-        "pid": "0x0007",
-        "device_version": "1.0.0",
-        "force_nkro": true
-    },
-    "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,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "multisplash": true
-        },
-        "driver": "snled27351",
-        "max_brightness": 200,
-        "react_on_keyup": true,
-        "sleep": true
-    },
-    "processor": "WB32FQ95",
-    "bootloader": "wb32-dfu",
-    "matrix_pins": {
-        "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"],
-        "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
-    },
-    "diode_direction": "ROW2COL",
-    "dip_switch": {
-        "pins": ["A9"]
-    },
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 8192
-        }
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B14", "pin_b": "B13", "resolution": 4}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 15
-    },
-    "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, 15], "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, 15], "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, 15], "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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 14.125, "y": 4.375},
-
-                {"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},
-                {"matrix": [5, 10], "x": 11, "y": 5.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25},
-
-                {"matrix": [5, 13], "x": 13.125, "y": 5.375},
-                {"matrix": [5, 14], "x": 14.125, "y": 5.375},
-                {"matrix": [5, 15], "x": 15.125, "y": 5.375}
-            ]
-        }
-    }
-}
diff --git a/keyboards/inland/kb83/keyboard.json b/keyboards/inland/kb83/keyboard.json
new file mode 100644
index 00000000000..31ca8f1bda9
--- /dev/null
+++ b/keyboards/inland/kb83/keyboard.json
@@ -0,0 +1,173 @@
+{
+    "keyboard_name": "KB83",
+    "manufacturer": "www.hfd.cn",
+    "maintainer": "hfd",
+    "usb": {
+        "vid": "0xFFFE",
+        "pid": "0x0007",
+        "device_version": "1.0.0",
+        "force_nkro": true
+    },
+    "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,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "multisplash": true
+        },
+        "driver": "snled27351",
+        "max_brightness": 200,
+        "react_on_keyup": true,
+        "sleep": true
+    },
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"],
+        "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
+    },
+    "diode_direction": "ROW2COL",
+    "dip_switch": {
+        "pins": ["A9"]
+    },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 8192
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B14", "pin_b": "B13", "resolution": 4}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 15
+    },
+    "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, 15], "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, 15], "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, 15], "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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.125, "y": 4.375},
+
+                {"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},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"matrix": [5, 13], "x": 13.125, "y": 5.375},
+                {"matrix": [5, 14], "x": 14.125, "y": 5.375},
+                {"matrix": [5, 15], "x": 15.125, "y": 5.375}
+            ]
+        }
+    }
+}
diff --git a/keyboards/inland/kb83/rgb_matrix_kb.inc b/keyboards/inland/kb83/rgb_matrix_kb.inc
deleted file mode 100644
index 56e2bd31cbb..00000000000
--- a/keyboards/inland/kb83/rgb_matrix_kb.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-// !!! DO NOT ADD #pragma once !!! //
-
-// Step 1.
-// Declare custom effects using the RGB_MATRIX_EFFECT macro
-// (note the lack of semicolon after the macro!)
-
-RGB_MATRIX_EFFECT(turn_off_rgb)
-RGB_MATRIX_EFFECT(kb_reset_rgb)
-
-// Step 2.
-// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block
-
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-// e.g: A simple effect, self-contained within a single method
-static bool turn_off_rgb(effect_params_t *params) {
-  RGB_MATRIX_USE_LIMITS(led_min, led_max);
-  for (uint8_t i = led_min; i < led_max; i++) {
-    rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
-  }
-  return rgb_matrix_check_finished_leds(led_max);
-}
-
-// e.g: A more complex effect, relying on external methods and state, with
-// dedicated init and run methods
-static uint8_t some_global_state;
-static void kb_reset_rgb_init(effect_params_t* params) {
-  some_global_state = 0;
-}
-static bool kb_reset_rgb_run(effect_params_t* params) {
-  RGB_MATRIX_USE_LIMITS(led_min, led_max);
-  some_global_state++;
-  if(some_global_state&0x01){
-      for (uint8_t i = led_min; i < led_max; i++)
-        rgb_matrix_set_color(i, 0, 0, 0);
-  }
-  else{
-      for (uint8_t i = led_min; i < led_max; i++) 
-        rgb_matrix_set_color(i, 0xc0, 0xc0, 0xc0);
-  }
-  if(some_global_state>=7)
-    rgb_matrix_init();
-  return rgb_matrix_check_finished_leds(led_max);
-}
-
-static bool kb_reset_rgb(effect_params_t* params) {
-  if (params->init) kb_reset_rgb_init(params);
-  return kb_reset_rgb_run(params);
-}
-
-#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/inland/kb83/rules.mk b/keyboards/inland/kb83/rules.mk
deleted file mode 100644
index aefdb5a168d..00000000000
--- a/keyboards/inland/kb83/rules.mk
+++ /dev/null
@@ -1,17 +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
-KEYBOARD_SHARED_EP = no
-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		# DPI Switch
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-#RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
deleted file mode 100644
index 51bf7a5f126..00000000000
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-    "keyboard_name": "Infinity Ergodox (QMK)",
-    "manufacturer": "Input:Club",
-    "usb": {
-        "vid": "0x1C11",
-        "pid": "0xB04D",
-        "device_version": "0.0.1"
-    },
-    "led_matrix": {
-        "animations":{
-            "alphas_mods": true,
-            "breathing": true,
-            "band": true,
-            "band_pinwheel": true,
-            "band_spiral": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "cycle_out_in": true,
-            "dual_beacon": true,
-            "solid_reactive_simple": 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,
-            "wave_left_right": true,
-            "wave_up_down": true
-        },
-        "driver": "is31fl3731",
-        "sleep": true,
-        "split_count": [38, 38]
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D4", "D5", "D6", "D7"],
-        "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",
-    "tapping": {
-        "toggle": 1
-    },
-    "community_layouts": ["ergodox"],
-    "layouts": {
-        "LAYOUT_ergodox": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
-                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
-                {"matrix": [5, 0], "x": 3.5, "y": 0},
-                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
-                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
-                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
-
-                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
-                {"matrix": [5, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
-                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
-                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
-                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [5, 2], "x": 3.5, "y": 2},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
-                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
-
-                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
-                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
-                {"matrix": [5, 3], "x": 3.5, "y": 3},
-                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
-                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
-                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
-                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
-                {"matrix": [5, 4], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-                {"matrix": [1, 3], "x": 6, "y": 5},
-                {"matrix": [0, 3], "x": 7, "y": 5},
-
-                {"matrix": [0, 4], "x": 7, "y": 6},
-                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
-                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
-
-                {"matrix": [1, 4], "x": 7, "y": 7},
-
-                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
-                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
-                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
-                {"matrix": [14, 0], "x": 12.5, "y": 0},
-                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
-                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
-                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
-                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
-                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
-                {"matrix": [14, 1], "x": 12.5, "y": 1},
-                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
-                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
-                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
-                {"matrix": [14, 2], "x": 12.5, "y": 2},
-                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
-                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
-                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
-                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
-                {"matrix": [14, 3], "x": 12.5, "y": 3},
-                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
-                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
-                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
-                {"matrix": [14, 4], "x": 12.5, "y": 4},
-                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
-                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
-                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
-
-                {"matrix": [9, 3], "x": 9, "y": 5},
-                {"matrix": [10, 3], "x": 10, "y": 5},
-
-                {"matrix": [9, 4], "x": 9, "y": 6},
-
-                {"matrix": [10, 4], "x": 9, "y": 7},
-
-                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
-                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
-            ]
-        },
-        "LAYOUT_ergodox_pretty": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
-                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
-                {"matrix": [5, 0], "x": 3.5, "y": 0},
-                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
-                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
-                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
-
-                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
-                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
-                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
-                {"matrix": [14, 0], "x": 12.5, "y": 0},
-                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
-                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
-                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
-                {"matrix": [5, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
-                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
-                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
-                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
-                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
-                {"matrix": [14, 1], "x": 12.5, "y": 1},
-                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
-                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
-                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [5, 2], "x": 3.5, "y": 2},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
-                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
-
-                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
-                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
-                {"matrix": [14, 2], "x": 12.5, "y": 2},
-                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
-                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
-
-                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
-                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
-                {"matrix": [5, 3], "x": 3.5, "y": 3},
-                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
-                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
-                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
-                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
-                {"matrix": [14, 3], "x": 12.5, "y": 3},
-                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
-                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
-                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
-                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
-                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
-                {"matrix": [5, 4], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
-                {"matrix": [14, 4], "x": 12.5, "y": 4},
-                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
-                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
-                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
-
-                {"matrix": [1, 3], "x": 6, "y": 5},
-                {"matrix": [0, 3], "x": 7, "y": 5},
-                {"matrix": [9, 3], "x": 9, "y": 5},
-                {"matrix": [10, 3], "x": 10, "y": 5},
-
-                {"matrix": [0, 4], "x": 7, "y": 6},
-                {"matrix": [9, 4], "x": 9, "y": 6},
-                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
-                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
-
-                {"matrix": [1, 4], "x": 7, "y": 7},
-                {"matrix": [10, 4], "x": 9, "y": 7},
-
-                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
-                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/input_club/ergodox_infinity/keyboard.json b/keyboards/input_club/ergodox_infinity/keyboard.json
new file mode 100644
index 00000000000..6f47d72685f
--- /dev/null
+++ b/keyboards/input_club/ergodox_infinity/keyboard.json
@@ -0,0 +1,253 @@
+{
+    "keyboard_name": "Infinity Ergodox (QMK)",
+    "manufacturer": "Input:Club",
+    "usb": {
+        "vid": "0x1C11",
+        "pid": "0xB04D",
+        "device_version": "0.0.1"
+    },
+    "led_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "breathing": true,
+            "band": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": 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,
+            "wave_left_right": true,
+            "wave_up_down": true
+        },
+        "driver": "is31fl3731",
+        "sleep": true,
+        "split_count": [38, 38]
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D4", "D5", "D6", "D7"],
+        "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true
+    },
+    "processor": "MK20DX256",
+    "bootloader": "kiibohd",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "led_matrix": true,
+        "unicode": true,
+        "swap_hands": true,
+        "sleep_led": true,
+        "st7565": true
+    },
+    "board": "IC_TEENSY_3_1",
+    "tapping": {
+        "toggle": 1
+    },
+    "community_layouts": ["ergodox"],
+    "layouts": {
+        "LAYOUT_ergodox": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [5, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [1, 3], "x": 6, "y": 5},
+                {"matrix": [0, 3], "x": 7, "y": 5},
+
+                {"matrix": [0, 4], "x": 7, "y": 6},
+                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [1, 4], "x": 7, "y": 7},
+
+                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [14, 0], "x": 12.5, "y": 0},
+                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [14, 1], "x": 12.5, "y": 1},
+                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [14, 2], "x": 12.5, "y": 2},
+                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [14, 3], "x": 12.5, "y": 3},
+                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [14, 4], "x": 12.5, "y": 4},
+                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [9, 3], "x": 9, "y": 5},
+                {"matrix": [10, 3], "x": 10, "y": 5},
+
+                {"matrix": [9, 4], "x": 9, "y": 6},
+
+                {"matrix": [10, 4], "x": 9, "y": 7},
+
+                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
+                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
+            ]
+        },
+        "LAYOUT_ergodox_pretty": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [14, 0], "x": 12.5, "y": 0},
+                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [14, 1], "x": 12.5, "y": 1},
+                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [14, 2], "x": 12.5, "y": 2},
+                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [14, 3], "x": 12.5, "y": 3},
+                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [5, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [14, 4], "x": 12.5, "y": 4},
+                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [1, 3], "x": 6, "y": 5},
+                {"matrix": [0, 3], "x": 7, "y": 5},
+                {"matrix": [9, 3], "x": 9, "y": 5},
+                {"matrix": [10, 3], "x": 10, "y": 5},
+
+                {"matrix": [0, 4], "x": 7, "y": 6},
+                {"matrix": [9, 4], "x": 9, "y": 6},
+                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [1, 4], "x": 7, "y": 7},
+                {"matrix": [10, 4], "x": 9, "y": 7},
+
+                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
+                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
+            ]
+        }
+    }
+}
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 da68a7f25d1..c6e29883213 100644
--- a/keyboards/input_club/ergodox_infinity/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/rules.mk
@@ -1,20 +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 = yes           # Enable N-Key Rollover
-UNICODE_ENABLE   = yes # Unicode
-SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
-SLEEP_LED_ENABLE = yes
-
-RGBLIGHT_ENABLE = no
-
 SERIAL_DRIVER = usart
-
-ST7565_ENABLE = yes
-
-LED_MATRIX_ENABLE = yes
diff --git a/keyboards/kagizaraya/miniaxe/info.json b/keyboards/kagizaraya/miniaxe/info.json
deleted file mode 100644
index a1de251618c..00000000000
--- a/keyboards/kagizaraya/miniaxe/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "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",
-    "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/rules.mk b/keyboards/kagizaraya/miniaxe/rules.mk
deleted file mode 100644
index f71583eb50d..00000000000
--- a/keyboards/kagizaraya/miniaxe/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 = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-DEBUG_ENABLE = no
diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
deleted file mode 100644
index fe6cf5bd012..00000000000
--- a/keyboards/kakunpc/rabbit_capture_plan/info.json
+++ /dev/null
@@ -1,131 +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": {
-        "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/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 698712de91f..00000000000
--- a/keyboards/kakunpc/rabbit_capture_plan/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
-OLED_ENABLE = no
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 502113e3b85..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/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 = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
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 a59c9aa4cf9..00000000000
--- a/keyboards/kbdfans/maja/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 = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
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 901d395d65a..00000000000
--- a/keyboards/kbdfans/maja_soldered/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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json
deleted file mode 100644
index c5571d31db0..00000000000
--- a/keyboards/keebio/bfo9000/info.json
+++ /dev/null
@@ -1,148 +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": {
-      "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/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 b7f1787db7b..00000000000
--- a/keyboards/keebio/bfo9000/rules.mk
+++ /dev/null
@@ -1,12 +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.
diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json
deleted file mode 100644
index 8f0de7e531e..00000000000
--- a/keyboards/keebio/fourier/info.json
+++ /dev/null
@@ -1,107 +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": {
-        "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/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 cda7d53ecb4..00000000000
--- a/keyboards/keebio/fourier/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 = 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.
diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
deleted file mode 100644
index b639cb4328f..00000000000
--- a/keyboards/keebio/iris/rev1/info.json
+++ /dev/null
@@ -1,112 +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": {
-        "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/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 2ed95720625..00000000000
--- a/keyboards/keebio/iris/rev1/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 = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
deleted file mode 100644
index 85e6ba797af..00000000000
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ /dev/null
@@ -1,111 +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": {
-        "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/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 2ed95720625..00000000000
--- a/keyboards/keebio/iris/rev1_led/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 = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
deleted file mode 100644
index e812a086e90..00000000000
--- a/keyboards/keebio/iris/rev5/info.json
+++ /dev/null
@@ -1,142 +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": {
-        "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/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 8b2f28c1c46..00000000000
--- a/keyboards/keebio/iris/rev5/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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json
deleted file mode 100644
index 105e159d5a3..00000000000
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ /dev/null
@@ -1,162 +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": {
-        "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/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 e39bab4422a..00000000000
--- a/keyboards/keebio/nyquist/rev1/rules.mk
+++ /dev/null
@@ -1,12 +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.
diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json
deleted file mode 100644
index 31987f2f949..00000000000
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ /dev/null
@@ -1,166 +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": {
-        "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/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 083a3e806cb..00000000000
--- a/keyboards/keebio/nyquist/rev2/rules.mk
+++ /dev/null
@@ -1,12 +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.
diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json
deleted file mode 100644
index 955c9281074..00000000000
--- a/keyboards/keebio/nyquist/rev3/info.json
+++ /dev/null
@@ -1,178 +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": {
-        "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/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 083a3e806cb..00000000000
--- a/keyboards/keebio/nyquist/rev3/rules.mk
+++ /dev/null
@@ -1,12 +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.
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/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/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json
deleted file mode 100644
index 29b1a9da723..00000000000
--- a/keyboards/keyprez/bison/info.json
+++ /dev/null
@@ -1,352 +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": {
-        "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/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 453f0a34d38..00000000000
--- a/keyboards/keyprez/bison/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
diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json
deleted file mode 100644
index 2d2ab010e79..00000000000
--- a/keyboards/keyprez/unicorn/info.json
+++ /dev/null
@@ -1,124 +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": {
-        "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/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 4f4828ca976..00000000000
--- a/keyboards/keyprez/unicorn/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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json
deleted file mode 100644
index 21f078a7c58..00000000000
--- a/keyboards/keystonecaps/gameroyadvance/info.json
+++ /dev/null
@@ -1,258 +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": {
-        "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/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 f90bd0ef997..00000000000
--- a/keyboards/keystonecaps/gameroyadvance/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
-
-ENCODER_ENABLE = yes
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 0af5f68e5e1..00000000000
--- a/keyboards/latincompass/latin17rgb/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
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk
index c05a204a403..3d1f3ae6de1 100644
--- a/keyboards/latincompass/latin6rgb/rules.mk
+++ b/keyboards/latincompass/latin6rgb/rules.mk
@@ -13,5 +13,3 @@ RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 
 RGB_MATRIX_ENABLE = yes
-
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/majistic/info.json b/keyboards/majistic/info.json
deleted file mode 100644
index 00dffa2fc19..00000000000
--- a/keyboards/majistic/info.json
+++ /dev/null
@@ -1,108 +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": {
-        "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/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 fce764c22d4..00000000000
--- a/keyboards/majistic/rules.mk
+++ /dev/null
@@ -1,12 +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
diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json
deleted file mode 100644
index 06bcfb88d71..00000000000
--- a/keyboards/manta60/info.json
+++ /dev/null
@@ -1,125 +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": {
-        "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/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 be0c854d3c6..00000000000
--- a/keyboards/manta60/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 = 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
-
-IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad, iPhone)
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 c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj61/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 = 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
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 c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj61/rev2/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 = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
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 c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj63/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 = 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
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 c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj63/rev2/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 = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
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 c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj64/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 = 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
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 c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj64/rev2/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 = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
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 c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj64/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 = 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
diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk
index 8b7f40c50b5..d3f22ef58ac 100644
--- a/keyboards/melgeek/mj65/rev3/rules.mk
+++ b/keyboards/melgeek/mj65/rev3/rules.mk
@@ -1,3 +1,2 @@
-RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED   = no
 BACKLIGHT_SUPPORTED  = no
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
deleted file mode 100644
index a667dbe11be..00000000000
--- a/keyboards/merge/um70/info.json
+++ /dev/null
@@ -1,412 +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": {
-        "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/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 45cbdcf0157..00000000000
--- a/keyboards/merge/um70/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
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
deleted file mode 100644
index 64939a18fbd..00000000000
--- a/keyboards/merge/um80/info.json
+++ /dev/null
@@ -1,155 +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": {
-        "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/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/rules.mk b/keyboards/merge/um80/rules.mk
deleted file mode 100644
index 45cbdcf0157..00000000000
--- a/keyboards/merge/um80/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
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json
deleted file mode 100644
index aeec25f0465..00000000000
--- a/keyboards/meson/info.json
+++ /dev/null
@@ -1,156 +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": {
-      "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/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 9686f2e033e..00000000000
--- a/keyboards/meson/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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
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/rules.mk b/keyboards/miller/gm862/rules.mk
deleted file mode 100644
index ea646d3d939..00000000000
--- a/keyboards/miller/gm862/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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json
deleted file mode 100644
index a7f992056ef..00000000000
--- a/keyboards/mint60/info.json
+++ /dev/null
@@ -1,123 +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": {
-    "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/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 e788df9b325..00000000000
--- a/keyboards/mint60/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 = yes       # Enable WS2812 RGB underlight.
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json
deleted file mode 100644
index f509451ab3d..00000000000
--- a/keyboards/momoka_ergo/info.json
+++ /dev/null
@@ -1,131 +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": {
-        "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/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 6d85e16f920..00000000000
--- a/keyboards/momoka_ergo/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 = 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/montsinger/rebound/rev4/rules.mk b/keyboards/montsinger/rebound/rev4/rules.mk
index 0fc2e835d76..643c971d472 100644
--- a/keyboards/montsinger/rebound/rev4/rules.mk
+++ b/keyboards/montsinger/rebound/rev4/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
 # Disable unsupported hardware
-RGBLIGHT_SUPPORTED = yes
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json
deleted file mode 100644
index e87c76e21a6..00000000000
--- a/keyboards/nacly/sodium42/info.json
+++ /dev/null
@@ -1,77 +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": {
-        "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/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 7c9f712027b..00000000000
--- a/keyboards/nacly/sodium42/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 = 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/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json
deleted file mode 100644
index e82dc8c1b5d..00000000000
--- a/keyboards/nacly/sodium50/info.json
+++ /dev/null
@@ -1,85 +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": {
-        "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/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 7c9f712027b..00000000000
--- a/keyboards/nacly/sodium50/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 = 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/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json
deleted file mode 100644
index 45f5c488b8c..00000000000
--- a/keyboards/nacly/sodium62/info.json
+++ /dev/null
@@ -1,99 +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": {
-        "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/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 020e7029212..00000000000
--- a/keyboards/nacly/sodium62/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
-
-OLED_ENABLE = yes
diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
deleted file mode 100644
index 85038a903b7..00000000000
--- a/keyboards/nacly/splitreus62/info.json
+++ /dev/null
@@ -1,106 +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": {
-      "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/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 28c29a3b4dc..00000000000
--- a/keyboards/nacly/splitreus62/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 = 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/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json
deleted file mode 100644
index bc997372785..00000000000
--- a/keyboards/obosob/arch_36/info.json
+++ /dev/null
@@ -1,80 +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": {
-        "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/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 7d3e33104ff..00000000000
--- a/keyboards/obosob/arch_36/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 = yes      # Enable keyboard RGB underglow
-OLED_ENABLE = yes
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json
deleted file mode 100644
index aecfffd7596..00000000000
--- a/keyboards/obosob/steal_this_keyboard/info.json
+++ /dev/null
@@ -1,85 +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": {
-        "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/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 f59e3a88231..00000000000
--- a/keyboards/obosob/steal_this_keyboard/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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-UNICODE_ENABLE = yes        # Unicode
-AUDIO_ENABLE = no           # Audio output
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 ff287d5235b..00000000000
--- a/keyboards/ogre/ergo_single/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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json
deleted file mode 100644
index d937fe9373a..00000000000
--- a/keyboards/ogre/ergo_split/info.json
+++ /dev/null
@@ -1,127 +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": {
-        "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/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 ff287d5235b..00000000000
--- a/keyboards/ogre/ergo_split/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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk
index a3b3ae4eaa8..871008928ea 100644
--- a/keyboards/phase_studio/titan65/hotswap/rules.mk
+++ b/keyboards/phase_studio/titan65/hotswap/rules.mk
@@ -14,4 +14,3 @@ RGB_MATRIX_ENABLE = yes
 
 AUDIO_SUPPORTED = no
 RGBLIGHT_SUPPORTED = no
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/pisces/info.json b/keyboards/pisces/info.json
deleted file mode 100644
index 48ef9db5c0e..00000000000
--- a/keyboards/pisces/info.json
+++ /dev/null
@@ -1,71 +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": {
-        "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/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 3b6a1809db1..00000000000
--- a/keyboards/pisces/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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk
index 9d3db5cdb72..97f68215f81 100644
--- a/keyboards/planck/ez/rules.mk
+++ b/keyboards/planck/ez/rules.mk
@@ -14,7 +14,6 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
 ENCODER_ENABLE = yes
 
-RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED = no
 BAKCLIGHT_SUPPORTED = no
 
diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json
deleted file mode 100644
index 0efd9db12d5..00000000000
--- a/keyboards/pluckey/info.json
+++ /dev/null
@@ -1,199 +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": {
-        "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/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 b03b6fa9058..00000000000
--- a/keyboards/pluckey/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
-ENCODER_ENABLE = yes
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json
deleted file mode 100644
index 2adb97ec511..00000000000
--- a/keyboards/pteron36/info.json
+++ /dev/null
@@ -1,142 +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": {
-        "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/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 182bad228c7..00000000000
--- a/keyboards/pteron36/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
-OLED_ENABLE = yes           # OLED display
-ENCODER_ENABLE = yes        # Encoder support
diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json
deleted file mode 100644
index 1051dfb673a..00000000000
--- a/keyboards/recompile_keys/cocoa40/info.json
+++ /dev/null
@@ -1,81 +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": {
-        "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/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 7552bdafa65..00000000000
--- a/keyboards/recompile_keys/cocoa40/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 = 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/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
deleted file mode 100644
index 4a3ed4cc90f..00000000000
--- a/keyboards/salicylic_acid3/7splus/info.json
+++ /dev/null
@@ -1,147 +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": {
-        "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/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 a3deaf30b97..00000000000
--- a/keyboards/salicylic_acid3/7splus/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 = 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
diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json
deleted file mode 100644
index 7c8110c1552..00000000000
--- a/keyboards/salicylic_acid3/ajisai74/info.json
+++ /dev/null
@@ -1,112 +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": {
-        "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/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 ab2c49da70e..00000000000
--- a/keyboards/salicylic_acid3/ajisai74/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 = 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/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
deleted file mode 100644
index bc6a715f1d6..00000000000
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ /dev/null
@@ -1,135 +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": {
-        "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/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 951dd07d6e0..00000000000
--- a/keyboards/salicylic_acid3/ergoarrows/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 = 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/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
deleted file mode 100644
index b5ac551bc9c..00000000000
--- a/keyboards/salicylic_acid3/nknl7en/info.json
+++ /dev/null
@@ -1,133 +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": {
-        "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/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 951dd07d6e0..00000000000
--- a/keyboards/salicylic_acid3/nknl7en/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 = 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/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
deleted file mode 100644
index 2501f84d9f9..00000000000
--- a/keyboards/salicylic_acid3/nknl7jp/info.json
+++ /dev/null
@@ -1,135 +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": {
-        "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/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 951dd07d6e0..00000000000
--- a/keyboards/salicylic_acid3/nknl7jp/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 = 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/satt/comet46/info.json b/keyboards/satt/comet46/info.json
deleted file mode 100644
index 5b11be662e5..00000000000
--- a/keyboards/satt/comet46/info.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "keyboard_name": "Comet46",
-    "manufacturer": "SatT",
-    "url": "",
-    "maintainer": "SatT",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 4], "x": 0, "y": 0.45},
-                {"matrix": [0, 1], "x": 1, "y": 0.45},
-                {"matrix": [1, 3], "x": 2, "y": 0.15},
-                {"matrix": [1, 0], "x": 3, "y": 0},
-                {"matrix": [2, 2], "x": 4, "y": 0.3},
-                {"matrix": [3, 3], "x": 5, "y": 0.45},
-
-                {"matrix": [3, 6], "x": 9, "y": 0.45},
-                {"matrix": [2, 7], "x": 10, "y": 0.3},
-                {"matrix": [1, 9], "x": 11, "y": 0},
-                {"matrix": [1, 6], "x": 12, "y": 0.15},
-                {"matrix": [0, 8], "x": 13, "y": 0.45},
-                {"matrix": [0, 5], "x": 14, "y": 0.45},
-
-                {"matrix": [0, 3], "x": 0, "y": 1.45},
-                {"matrix": [0, 0], "x": 1, "y": 1.45},
-                {"matrix": [1, 2], "x": 2, "y": 1.15},
-                {"matrix": [2, 4], "x": 3, "y": 1},
-                {"matrix": [2, 1], "x": 4, "y": 1.3},
-                {"matrix": [3, 2], "x": 5, "y": 1.45},
-                {"matrix": [4, 3], "x": 6, "y": 1},
-
-                {"matrix": [4, 6], "x": 8, "y": 1},
-                {"matrix": [3, 7], "x": 9, "y": 1.45},
-                {"matrix": [2, 8], "x": 10, "y": 1.3},
-                {"matrix": [2, 5], "x": 11, "y": 1},
-                {"matrix": [1, 7], "x": 12, "y": 1.15},
-                {"matrix": [0, 9], "x": 13, "y": 1.45},
-                {"matrix": [0, 6], "x": 14, "y": 1.45},
-
-                {"matrix": [0, 2], "x": 0, "y": 2.45},
-                {"matrix": [1, 4], "x": 1, "y": 2.45},
-                {"matrix": [1, 1], "x": 2, "y": 2.15},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 0], "x": 4, "y": 2.3},
-                {"matrix": [3, 1], "x": 5, "y": 2.45},
-                {"matrix": [4, 2], "x": 6, "y": 2},
-
-                {"matrix": [4, 7], "x": 8, "y": 2},
-                {"matrix": [3, 8], "x": 9, "y": 2.45},
-                {"matrix": [2, 9], "x": 10, "y": 2.3},
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [1, 8], "x": 12, "y": 2.15},
-                {"matrix": [1, 5], "x": 13, "y": 2.45},
-                {"matrix": [0, 7], "x": 14, "y": 2.45},
-
-                {"matrix": [3, 4], "x": 4, "y": 3.9},
-                {"matrix": [4, 4], "x": 5, "y": 3.9},
-                {"matrix": [4, 1], "x": 6, "y": 3.4, "h": 1.5},
-
-                {"matrix": [4, 8], "x": 8, "y": 3.4, "h": 1.5},
-                {"matrix": [4, 5], "x": 9, "y": 3.9},
-                {"matrix": [3, 5], "x": 10, "y": 3.9}
-            ]
-        }
-    }
-}
diff --git a/keyboards/satt/comet46/keyboard.json b/keyboards/satt/comet46/keyboard.json
new file mode 100644
index 00000000000..0092f19c799
--- /dev/null
+++ b/keyboards/satt/comet46/keyboard.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "Comet46",
+    "manufacturer": "SatT",
+    "url": "",
+    "maintainer": "SatT",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 4], "x": 0, "y": 0.45},
+                {"matrix": [0, 1], "x": 1, "y": 0.45},
+                {"matrix": [1, 3], "x": 2, "y": 0.15},
+                {"matrix": [1, 0], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0.3},
+                {"matrix": [3, 3], "x": 5, "y": 0.45},
+
+                {"matrix": [3, 6], "x": 9, "y": 0.45},
+                {"matrix": [2, 7], "x": 10, "y": 0.3},
+                {"matrix": [1, 9], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0.15},
+                {"matrix": [0, 8], "x": 13, "y": 0.45},
+                {"matrix": [0, 5], "x": 14, "y": 0.45},
+
+                {"matrix": [0, 3], "x": 0, "y": 1.45},
+                {"matrix": [0, 0], "x": 1, "y": 1.45},
+                {"matrix": [1, 2], "x": 2, "y": 1.15},
+                {"matrix": [2, 4], "x": 3, "y": 1},
+                {"matrix": [2, 1], "x": 4, "y": 1.3},
+                {"matrix": [3, 2], "x": 5, "y": 1.45},
+                {"matrix": [4, 3], "x": 6, "y": 1},
+
+                {"matrix": [4, 6], "x": 8, "y": 1},
+                {"matrix": [3, 7], "x": 9, "y": 1.45},
+                {"matrix": [2, 8], "x": 10, "y": 1.3},
+                {"matrix": [2, 5], "x": 11, "y": 1},
+                {"matrix": [1, 7], "x": 12, "y": 1.15},
+                {"matrix": [0, 9], "x": 13, "y": 1.45},
+                {"matrix": [0, 6], "x": 14, "y": 1.45},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.45},
+                {"matrix": [1, 4], "x": 1, "y": 2.45},
+                {"matrix": [1, 1], "x": 2, "y": 2.15},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 4, "y": 2.3},
+                {"matrix": [3, 1], "x": 5, "y": 2.45},
+                {"matrix": [4, 2], "x": 6, "y": 2},
+
+                {"matrix": [4, 7], "x": 8, "y": 2},
+                {"matrix": [3, 8], "x": 9, "y": 2.45},
+                {"matrix": [2, 9], "x": 10, "y": 2.3},
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [1, 8], "x": 12, "y": 2.15},
+                {"matrix": [1, 5], "x": 13, "y": 2.45},
+                {"matrix": [0, 7], "x": 14, "y": 2.45},
+
+                {"matrix": [3, 4], "x": 4, "y": 3.9},
+                {"matrix": [4, 4], "x": 5, "y": 3.9},
+                {"matrix": [4, 1], "x": 6, "y": 3.4, "h": 1.5},
+
+                {"matrix": [4, 8], "x": 8, "y": 3.4, "h": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 3.9},
+                {"matrix": [3, 5], "x": 10, "y": 3.9}
+            ]
+        }
+    }
+}
diff --git a/keyboards/satt/comet46/rules.mk b/keyboards/satt/comet46/rules.mk
index 0db5166ffac..18d234d62a0 100644
--- a/keyboards/satt/comet46/rules.mk
+++ b/keyboards/satt/comet46/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 = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/scatter42/info.json b/keyboards/scatter42/info.json
deleted file mode 100644
index c0f8df47bee..00000000000
--- a/keyboards/scatter42/info.json
+++ /dev/null
@@ -1,77 +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": {
-        "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/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 ab2c49da70e..00000000000
--- a/keyboards/scatter42/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 = 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/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/info.json
deleted file mode 100644
index 833cd747895..00000000000
--- a/keyboards/sekigon/grs_70ec/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "GRS-70EC",
-    "manufacturer": "sekigon-gonnoc",
-    "url": "https://github.com/sekigon-gonnoc/GRS-70EC-doc/",
-    "maintainer": "sekigon-gonnoc",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x70EC",
-        "device_version": "0.0.1"
-    },
-    "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, 0], "x": 7.75, "y": 0},
-                {"matrix": [5, 1], "x": 8.75, "y": 0},
-                {"matrix": [5, 2], "x": 9.75, "y": 0},
-                {"matrix": [5, 3], "x": 10.75, "y": 0},
-                {"matrix": [5, 4], "x": 11.75, "y": 0},
-                {"matrix": [5, 5], "x": 12.75, "y": 0},
-                {"matrix": [5, 6], "x": 13.75, "y": 0},
-                {"matrix": [5, 7], "x": 14.75, "y": 0},
-
-                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-
-                {"matrix": [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": [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": [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},
-
-                {"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": [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},
-                {"matrix": [8, 7], "x": 14.75, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 5.5, "y": 4, "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, 5], "x": 12.75, "y": 4},
-                {"matrix": [9, 6], "x": 13.75, "y": 4},
-                {"matrix": [9, 7], "x": 14.75, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/sekigon/grs_70ec/keyboard.json b/keyboards/sekigon/grs_70ec/keyboard.json
new file mode 100644
index 00000000000..e940e71d884
--- /dev/null
+++ b/keyboards/sekigon/grs_70ec/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "GRS-70EC",
+    "manufacturer": "sekigon-gonnoc",
+    "url": "https://github.com/sekigon-gonnoc/GRS-70EC-doc/",
+    "maintainer": "sekigon-gonnoc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x70EC",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "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, 0], "x": 7.75, "y": 0},
+                {"matrix": [5, 1], "x": 8.75, "y": 0},
+                {"matrix": [5, 2], "x": 9.75, "y": 0},
+                {"matrix": [5, 3], "x": 10.75, "y": 0},
+                {"matrix": [5, 4], "x": 11.75, "y": 0},
+                {"matrix": [5, 5], "x": 12.75, "y": 0},
+                {"matrix": [5, 6], "x": 13.75, "y": 0},
+                {"matrix": [5, 7], "x": 14.75, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+
+                {"matrix": [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": [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": [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},
+
+                {"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": [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},
+                {"matrix": [8, 7], "x": 14.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.5, "y": 4, "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, 5], "x": 12.75, "y": 4},
+                {"matrix": [9, 6], "x": 13.75, "y": 4},
+                {"matrix": [9, 7], "x": 14.75, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sekigon/grs_70ec/rules.mk b/keyboards/sekigon/grs_70ec/rules.mk
index ac989e7ea83..37cfffd7692 100644
--- a/keyboards/sekigon/grs_70ec/rules.mk
+++ b/keyboards/sekigon/grs_70ec/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 = 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
 
 ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/shandoncodes/mino_plus/hotswap/info.json b/keyboards/shandoncodes/mino_plus/hotswap/info.json
deleted file mode 100644
index b7cda6d71ff..00000000000
--- a/keyboards/shandoncodes/mino_plus/hotswap/info.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "manufacturer": "ShandonCodes",
-    "keyboard_name": "Mino Plus (Hotswap)",
-    "maintainer": "ShandonCodes",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["B12", "A15", "B3", "B2", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "F1", "A0", "A8", "A10"],
-        "rows": ["B14", "B10", "F0", "C15", "C14"]
-    },
-    "processor": "STM32F072",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0004",
-        "vid": "0x7877"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "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": "Del", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Ins", "matrix": [1, 14], "x": 15, "y": 1},
-                {"label": "Caps", "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": 10.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Pgup", "matrix": [2, 14], "x": 14, "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, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Up", "matrix": [3, 12], "x": 14, "y": 3},
-                {"label": "Pgdn", "matrix": [3, 14], "x": 15, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Super", "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": "Meta", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4},
-                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json b/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json
new file mode 100644
index 00000000000..f181c610ed1
--- /dev/null
+++ b/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json
@@ -0,0 +1,102 @@
+{
+    "manufacturer": "ShandonCodes",
+    "keyboard_name": "Mino Plus (Hotswap)",
+    "maintainer": "ShandonCodes",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "wpm": true
+    },
+    "matrix_pins": {
+        "cols": ["B12", "A15", "B3", "B2", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "F1", "A0", "A8", "A10"],
+        "rows": ["B14", "B10", "F0", "C15", "C14"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x7877"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Ins", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "Caps", "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": 10.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Pgup", "matrix": [2, 14], "x": 14, "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, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 12], "x": 14, "y": 3},
+                {"label": "Pgdn", "matrix": [3, 14], "x": 15, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Super", "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": "Meta", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/shandoncodes/mino_plus/hotswap/rules.mk b/keyboards/shandoncodes/mino_plus/hotswap/rules.mk
deleted file mode 100644
index 76e55c05f48..00000000000
--- a/keyboards/shandoncodes/mino_plus/hotswap/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/shandoncodes/mino_plus/soldered/info.json b/keyboards/shandoncodes/mino_plus/soldered/info.json
deleted file mode 100644
index 52b612e01bf..00000000000
--- a/keyboards/shandoncodes/mino_plus/soldered/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "manufacturer": "ShandonCodes",
-    "keyboard_name": "Mino Plus",
-    "maintainer": "ShandonCodes",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["B4", "B3", "A15", "A10", "A8", "B14", "B12", "B10", "A5", "A4", "A3", "B0", "A7", "C15", "B5"],
-        "rows": ["B9", "B8", "A2", "A1", "A0"]
-    },
-    "processor": "STM32F072",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0003",
-        "vid": "0x7877"
-    },
-    "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": [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, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/shandoncodes/mino_plus/soldered/keyboard.json b/keyboards/shandoncodes/mino_plus/soldered/keyboard.json
new file mode 100644
index 00000000000..2b717c4c597
--- /dev/null
+++ b/keyboards/shandoncodes/mino_plus/soldered/keyboard.json
@@ -0,0 +1,109 @@
+{
+    "manufacturer": "ShandonCodes",
+    "keyboard_name": "Mino Plus",
+    "maintainer": "ShandonCodes",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "wpm": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B3", "A15", "A10", "A8", "B14", "B12", "B10", "A5", "A4", "A3", "B0", "A7", "C15", "B5"],
+        "rows": ["B9", "B8", "A2", "A1", "A0"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0003",
+        "vid": "0x7877"
+    },
+    "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": [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, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/shandoncodes/mino_plus/soldered/rules.mk b/keyboards/shandoncodes/mino_plus/soldered/rules.mk
deleted file mode 100644
index 76e55c05f48..00000000000
--- a/keyboards/shandoncodes/mino_plus/soldered/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/info.json b/keyboards/sharkoon/skiller_sgk50_s2/keyboard.json
similarity index 100%
rename from keyboards/sharkoon/skiller_sgk50_s2/info.json
rename to keyboards/sharkoon/skiller_sgk50_s2/keyboard.json
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk b/keyboards/sharkoon/skiller_sgk50_s2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/signum/3_0/elitec/info.json b/keyboards/signum/3_0/elitec/info.json
deleted file mode 100644
index 84336ac59f4..00000000000
--- a/keyboards/signum/3_0/elitec/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B4", "D7", "D0", "E6", "D4", "F6", "F4", "F7", "B1", "B3", "C6", "B2"],
-        "rows": ["D2", "D1", "F5", "B5"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/signum/3_0/elitec/keyboard.json b/keyboards/signum/3_0/elitec/keyboard.json
new file mode 100644
index 00000000000..5482e519a1a
--- /dev/null
+++ b/keyboards/signum/3_0/elitec/keyboard.json
@@ -0,0 +1,13 @@
+{
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D0", "E6", "D4", "F6", "F4", "F7", "B1", "B3", "C6", "B2"],
+        "rows": ["D2", "D1", "F5", "B5"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/signum/3_0/elitec/rules.mk b/keyboards/signum/3_0/elitec/rules.mk
index 614691a01be..16051206467 100644
--- a/keyboards/signum/3_0/elitec/rules.mk
+++ b/keyboards/signum/3_0/elitec/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/signum/3_0/teensy/info.json b/keyboards/signum/3_0/teensy/info.json
deleted file mode 100644
index 7eae1153236..00000000000
--- a/keyboards/signum/3_0/teensy/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["C6", "D2", "B7", "D3", "D0", "F7", "F5", "B6", "B5", "B4", "D1", "D7"],
-        "rows": ["B0", "B3", "F6", "C7"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/signum/3_0/teensy/keyboard.json b/keyboards/signum/3_0/teensy/keyboard.json
new file mode 100644
index 00000000000..1db8479d9b0
--- /dev/null
+++ b/keyboards/signum/3_0/teensy/keyboard.json
@@ -0,0 +1,13 @@
+{
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D2", "B7", "D3", "D0", "F7", "F5", "B6", "B5", "B4", "D1", "D7"],
+        "rows": ["B0", "B3", "F6", "C7"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/signum/3_0/teensy/rules.mk b/keyboards/signum/3_0/teensy/rules.mk
index 614691a01be..16051206467 100644
--- a/keyboards/signum/3_0/teensy/rules.mk
+++ b/keyboards/signum/3_0/teensy/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
deleted file mode 100644
index e232fdba3e8..00000000000
--- a/keyboards/silverbullet44/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "keyboard_name": "SilverBullet44",
-    "manufacturer": "SwanMatch",
-    "url": "https://swanmatch.booth.pm/items/1561270",
-    "maintainer": "swanmatch",
-    "usb": {
-        "vid": "0x16C0",
-        "pid": "0x27DB",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "typing_heatmap": true
-        },
-        "default": {
-            "animation": "typing_heatmap"
-        },
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "sat_steps": 8,
-        "val_steps": 8,
-        "speed_steps": 8
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 52,
-        "max_brightness": 150,
-        "led_map": [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 3, 4, 5, 6, 26, 27, 28, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 29, 30, 31, 32],
-        "split_count": [26, 26],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true
-        }
-    },
-    "matrix_pins": {
-        "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "debounce": 10,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.375},
-                {"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.25},
-                {"matrix": [0, 5], "x": 5, "y": 0.5},
-
-                {"matrix": [4, 5], "x": 12, "y": 0.5},
-                {"matrix": [4, 4], "x": 13, "y": 0.25},
-                {"matrix": [4, 3], "x": 14, "y": 0},
-                {"matrix": [4, 2], "x": 15, "y": 0.25},
-                {"matrix": [4, 1], "x": 16, "y": 0.75},
-                {"matrix": [4, 0], "x": 17, "y": 1.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.375},
-                {"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.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-
-                {"matrix": [5, 5], "x": 12, "y": 1.5},
-                {"matrix": [5, 4], "x": 13, "y": 1.25},
-                {"matrix": [5, 3], "x": 14, "y": 1},
-                {"matrix": [5, 2], "x": 15, "y": 1.25},
-                {"matrix": [5, 1], "x": 16, "y": 1.75},
-                {"matrix": [5, 0], "x": 17, "y": 2.375},
-
-                {"matrix": [2, 0], "x": 12, "y": 2.5},
-                {"matrix": [2, 1], "x": 13, "y": 2.25},
-                {"matrix": [2, 2], "x": 14, "y": 2},
-                {"matrix": [2, 3], "x": 15, "y": 2.25},
-                {"matrix": [2, 4], "x": 16, "y": 2.75},
-                {"matrix": [2, 5], "x": 17, "y": 3.375},
-
-                {"matrix": [6, 5], "x": 0, "y": 3.375},
-                {"matrix": [6, 4], "x": 1, "y": 2.75},
-                {"matrix": [6, 3], "x": 2, "y": 2.25},
-                {"matrix": [6, 2], "x": 3, "y": 2},
-                {"matrix": [6, 1], "x": 4, "y": 2.25},
-                {"matrix": [6, 0], "x": 5, "y": 2.5},
-
-                {"matrix": [3, 2], "x": 4, "y": 3.25, "h": 1.25},
-                {"matrix": [3, 3], "x": 5, "y": 3.5},
-                {"matrix": [3, 4], "x": -0.5, "y": 3.5, "h": 1.5},
-                {"matrix": [3, 5], "x": 7, "y": 3.25, "h": 1.5},
-
-                {"matrix": [7, 5], "x": -3, "y": 3.5, "h": 1.5},
-                {"matrix": [7, 4], "x": -2, "y": 3.5, "h": 1.5},
-                {"matrix": [7, 3], "x": 12, "y": 3.5},
-                {"matrix": [7, 2], "x": 13, "y": 3.25, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/silverbullet44/keyboard.json b/keyboards/silverbullet44/keyboard.json
new file mode 100644
index 00000000000..793ec229e4b
--- /dev/null
+++ b/keyboards/silverbullet44/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "SilverBullet44",
+    "manufacturer": "SwanMatch",
+    "url": "https://swanmatch.booth.pm/items/1561270",
+    "maintainer": "swanmatch",
+    "usb": {
+        "vid": "0x16C0",
+        "pid": "0x27DB",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "typing_heatmap"
+        },
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 8
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 52,
+        "max_brightness": 150,
+        "led_map": [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 3, 4, 5, 6, 26, 27, 28, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 29, 30, 31, 32],
+        "split_count": [26, 26],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "debounce": 10,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.375},
+                {"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.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+                {"matrix": [4, 5], "x": 12, "y": 0.5},
+                {"matrix": [4, 4], "x": 13, "y": 0.25},
+                {"matrix": [4, 3], "x": 14, "y": 0},
+                {"matrix": [4, 2], "x": 15, "y": 0.25},
+                {"matrix": [4, 1], "x": 16, "y": 0.75},
+                {"matrix": [4, 0], "x": 17, "y": 1.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.375},
+                {"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.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"matrix": [5, 5], "x": 12, "y": 1.5},
+                {"matrix": [5, 4], "x": 13, "y": 1.25},
+                {"matrix": [5, 3], "x": 14, "y": 1},
+                {"matrix": [5, 2], "x": 15, "y": 1.25},
+                {"matrix": [5, 1], "x": 16, "y": 1.75},
+                {"matrix": [5, 0], "x": 17, "y": 2.375},
+
+                {"matrix": [2, 0], "x": 12, "y": 2.5},
+                {"matrix": [2, 1], "x": 13, "y": 2.25},
+                {"matrix": [2, 2], "x": 14, "y": 2},
+                {"matrix": [2, 3], "x": 15, "y": 2.25},
+                {"matrix": [2, 4], "x": 16, "y": 2.75},
+                {"matrix": [2, 5], "x": 17, "y": 3.375},
+
+                {"matrix": [6, 5], "x": 0, "y": 3.375},
+                {"matrix": [6, 4], "x": 1, "y": 2.75},
+                {"matrix": [6, 3], "x": 2, "y": 2.25},
+                {"matrix": [6, 2], "x": 3, "y": 2},
+                {"matrix": [6, 1], "x": 4, "y": 2.25},
+                {"matrix": [6, 0], "x": 5, "y": 2.5},
+
+                {"matrix": [3, 2], "x": 4, "y": 3.25, "h": 1.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.5},
+                {"matrix": [3, 4], "x": -0.5, "y": 3.5, "h": 1.5},
+                {"matrix": [3, 5], "x": 7, "y": 3.25, "h": 1.5},
+
+                {"matrix": [7, 5], "x": -3, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 4], "x": -2, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 3], "x": 12, "y": 3.5},
+                {"matrix": [7, 2], "x": 13, "y": 3.25, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk
deleted file mode 100644
index 95e92dce2a4..00000000000
--- a/keyboards/silverbullet44/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 = 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
-RGB_MATRIX_ENABLE = no
-AUDIO_ENABLE = yes          # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/sirius/uni660/rev1/info.json b/keyboards/sirius/uni660/rev1/info.json
deleted file mode 100644
index f5b070f87e1..00000000000
--- a/keyboards/sirius/uni660/rev1/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "Uni660",
-    "manufacturer": "SiRius",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x5352",
-        "pid": "0x0201",
-        "device_version": "19.1.2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "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": [4, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-                {"matrix": [0, 9], "x": 10.5, "y": 0},
-                {"matrix": [0, 10], "x": 11.5, "y": 0},
-                {"matrix": [0, 11], "x": 12.5, "y": 0},
-                {"matrix": [0, 12], "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},
-
-                {"matrix": [3, 15], "x": 18, "y": 0},
-
-                {"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": 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": 16, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 18, "y": 1},
-
-                {"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": 9.25, "y": 2},
-                {"matrix": [2, 9], "x": 10.25, "y": 2},
-                {"matrix": [2, 10], "x": 11.25, "y": 2},
-                {"matrix": [2, 11], "x": 12.25, "y": 2},
-                {"matrix": [2, 12], "x": 13.25, "y": 2},
-                {"matrix": [2, 13], "x": 14.25, "y": 2},
-                {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"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, "w": 2.25},
-                {"matrix": [3, 14], "x": 17, "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, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 7.5, "y": 4},
-
-                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 14.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 16, "y": 4},
-                {"matrix": [4, 14], "x": 17, "y": 4},
-                {"matrix": [4, 15], "x": 18, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/sirius/uni660/rev1/keyboard.json b/keyboards/sirius/uni660/rev1/keyboard.json
new file mode 100644
index 00000000000..793edcc6858
--- /dev/null
+++ b/keyboards/sirius/uni660/rev1/keyboard.json
@@ -0,0 +1,118 @@
+{
+    "keyboard_name": "Uni660",
+    "manufacturer": "SiRius",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5352",
+        "pid": "0x0201",
+        "device_version": "19.1.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "unicode": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "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": [4, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "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},
+
+                {"matrix": [3, 15], "x": 18, "y": 0},
+
+                {"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": 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": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 18, "y": 1},
+
+                {"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": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"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, "w": 2.25},
+                {"matrix": [3, 14], "x": 17, "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, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4},
+
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 16, "y": 4},
+                {"matrix": [4, 14], "x": 17, "y": 4},
+                {"matrix": [4, 15], "x": 18, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sirius/uni660/rev1/rules.mk b/keyboards/sirius/uni660/rev1/rules.mk
index 7ac75072699..18d234d62a0 100644
--- a/keyboards/sirius/uni660/rev1/rules.mk
+++ b/keyboards/sirius/uni660/rev1/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 = 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
-UNICODE_ENABLE = yes        # Unicode
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/sirius/unigo66/info.json b/keyboards/sirius/unigo66/info.json
deleted file mode 100644
index 866fd9abbf9..00000000000
--- a/keyboards/sirius/unigo66/info.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-    "keyboard_name": "UniGo66",
-    "manufacturer": "Sirius",
-    "url": "https://discord.gg/GJ8bdM",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1001",
-        "device_version": "19.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [2, 9], "x": 0, "y": 0, "w": 1.5},
-                {"matrix": [1, 14], "x": 1.5, "y": 0},
-                {"matrix": [1, 15], "x": 2.5, "y": 0},
-                {"matrix": [2, 0], "x": 3.5, "y": 0},
-                {"matrix": [2, 1], "x": 4.5, "y": 0},
-                {"matrix": [2, 2], "x": 5.5, "y": 0},
-                {"matrix": [2, 13], "x": 6.5, "y": 0},
-
-                {"matrix": [2, 14], "x": 9.5, "y": 0},
-                {"matrix": [2, 3], "x": 10.5, "y": 0},
-                {"matrix": [2, 4], "x": 11.5, "y": 0},
-                {"matrix": [2, 5], "x": 12.5, "y": 0},
-                {"matrix": [2, 6], "x": 13.5, "y": 0},
-                {"matrix": [2, 7], "x": 14.5, "y": 0},
-                {"matrix": [2, 10], "x": 15.5, "y": 0, "w": 1.5},
-
-                {"matrix": [2, 11], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 4], "x": 1.5, "y": 1},
-                {"matrix": [1, 10], "x": 2.5, "y": 1},
-                {"matrix": [0, 8], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-                {"matrix": [4, 11], "x": 6.5, "y": 1, "h": 1.5},
-
-                {"matrix": [2, 15], "x": 9.5, "y": 1, "h": 1.5},
-                {"matrix": [1, 12], "x": 10.5, "y": 1},
-                {"matrix": [1, 8], "x": 11.5, "y": 1},
-                {"matrix": [0, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 2], "x": 13.5, "y": 1},
-                {"matrix": [1, 3], "x": 14.5, "y": 1},
-                {"matrix": [3, 1], "x": 15.5, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 9], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [0, 4], "x": 1.5, "y": 2},
-                {"matrix": [1, 6], "x": 2.5, "y": 2},
-                {"matrix": [0, 7], "x": 3.5, "y": 2},
-                {"matrix": [0, 9], "x": 4.5, "y": 2},
-                {"matrix": [0, 10], "x": 5.5, "y": 2},
-
-                {"matrix": [0, 11], "x": 10.5, "y": 2},
-                {"matrix": [0, 13], "x": 11.5, "y": 2},
-                {"matrix": [0, 14], "x": 12.5, "y": 2},
-                {"matrix": [0, 15], "x": 13.5, "y": 2},
-                {"matrix": [3, 3], "x": 14.5, "y": 2},
-                {"matrix": [3, 4], "x": 15.5, "y": 2, "w": 1.5},
-
-                {"matrix": [14, 1], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [1, 13], "x": 1.5, "y": 3},
-                {"matrix": [1, 11], "x": 2.5, "y": 3},
-                {"matrix": [0, 6], "x": 3.5, "y": 3},
-                {"matrix": [1, 9], "x": 4.5, "y": 3},
-                {"matrix": [0, 5], "x": 5.5, "y": 3},
-                {"matrix": [4, 14], "x": 6.5, "y": 2.5, "h": 1.5},
-
-                {"matrix": [3, 0], "x": 9.5, "y": 2.5, "h": 1.5},
-                {"matrix": [1, 1], "x": 10.5, "y": 3},
-                {"matrix": [1, 0], "x": 11.5, "y": 3},
-                {"matrix": [3, 6], "x": 12.5, "y": 3},
-                {"matrix": [3, 7], "x": 13.5, "y": 3},
-                {"matrix": [5, 2], "x": 14.5, "y": 3},
-                {"matrix": [14, 5], "x": 15.5, "y": 3, "w": 1.5},
-
-                {"matrix": [14, 0], "x": 0.5, "y": 4},
-                {"matrix": [14, 3], "x": 1.5, "y": 4},
-                {"matrix": [14, 2], "x": 2.5, "y": 4},
-                {"matrix": [5, 0], "x": 13.5, "y": 4},
-                {"matrix": [5, 1], "x": 14.5, "y": 4},
-                {"matrix": [4, 15], "x": 15.5, "y": 4},
-
-                {"matrix": [2, 12], "x": 5.5, "y": 5},
-                {"matrix": [4, 9], "x": 6.5, "y": 5},
-
-                {"matrix": [4, 10], "x": 9.5, "y": 5},
-                {"matrix": [2, 8], "x": 10.5, "y": 5},
-
-                {"matrix": [14, 6], "x": 5.5, "y": 6},
-                {"matrix": [4, 12], "x": 6.5, "y": 6},
-
-                {"matrix": [4, 13], "x": 9.5, "y": 6},
-                {"matrix": [14, 4], "x": 10.5, "y": 6}
-            ]
-        },
-        "LAYOUT_beta_pcb": {
-            "layout": [
-                {"matrix": [1, 13], "x": 0, "y": 0, "w": 1.5},
-                {"matrix": [1, 14], "x": 1.5, "y": 0},
-                {"matrix": [3, 0], "x": 2.5, "y": 0},
-                {"matrix": [2, 15], "x": 3.5, "y": 0},
-                {"matrix": [4, 5], "x": 4.5, "y": 0},
-                {"matrix": [3, 11], "x": 5.5, "y": 0},
-                {"matrix": [14, 6], "x": 6.5, "y": 0},
-
-                {"matrix": [14, 2], "x": 9.5, "y": 0},
-                {"matrix": [3, 10], "x": 10.5, "y": 0},
-                {"matrix": [3, 9], "x": 11.5, "y": 0},
-                {"matrix": [1, 4], "x": 12.5, "y": 0},
-                {"matrix": [0, 4], "x": 13.5, "y": 0},
-                {"matrix": [0, 9], "x": 14.5, "y": 0},
-                {"matrix": [0, 7], "x": 15.5, "y": 0, "w": 1.5},
-
-                {"matrix": [2, 9], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 5], "x": 1.5, "y": 1},
-                {"matrix": [3, 12], "x": 2.5, "y": 1},
-                {"matrix": [3, 13], "x": 3.5, "y": 1},
-                {"matrix": [3, 14], "x": 4.5, "y": 1},
-                {"matrix": [3, 15], "x": 5.5, "y": 1},
-                {"matrix": [5, 8], "x": 6.5, "y": 1, "h": 1.5},
-
-                {"matrix": [5, 0], "x": 9.5, "y": 1, "h": 1.5},
-                {"matrix": [2, 12], "x": 10.5, "y": 1},
-                {"matrix": [1, 1], "x": 11.5, "y": 1},
-                {"matrix": [0, 5], "x": 12.5, "y": 1},
-                {"matrix": [5, 5], "x": 13.5, "y": 1},
-                {"matrix": [1, 0], "x": 14.5, "y": 1},
-                {"matrix": [0, 6], "x": 15.5, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 1], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [5, 15], "x": 1.5, "y": 2},
-                {"matrix": [5, 14], "x": 2.5, "y": 2},
-                {"matrix": [6, 1], "x": 3.5, "y": 2},
-                {"matrix": [2, 10], "x": 4.5, "y": 2},
-                {"matrix": [3, 8], "x": 5.5, "y": 2},
-
-                {"matrix": [4, 12], "x": 10.5, "y": 2},
-                {"matrix": [5, 7], "x": 11.5, "y": 2},
-                {"matrix": [5, 3], "x": 12.5, "y": 2},
-                {"matrix": [5, 11], "x": 13.5, "y": 2},
-                {"matrix": [5, 10], "x": 14.5, "y": 2},
-                {"matrix": [0, 8], "x": 15.5, "y": 2, "w": 1.5},
-
-                {"matrix": [3, 5], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [5, 13], "x": 1.5, "y": 3},
-                {"matrix": [1, 7], "x": 2.5, "y": 3},
-                {"matrix": [1, 11], "x": 3.5, "y": 3},
-                {"matrix": [1, 10], "x": 4.5, "y": 3},
-                {"matrix": [5, 2], "x": 5.5, "y": 3},
-                {"matrix": [5, 6], "x": 6.5, "y": 2.5, "h": 1.5},
-
-                {"matrix": [5, 1], "x": 9.5, "y": 2.5, "h": 1.5},
-                {"matrix": [4, 13], "x": 10.5, "y": 3},
-                {"matrix": [2, 3], "x": 11.5, "y": 3},
-                {"matrix": [1, 12], "x": 12.5, "y": 3},
-                {"matrix": [1, 3], "x": 13.5, "y": 3},
-                {"matrix": [2, 14], "x": 14.5, "y": 3},
-                {"matrix": [0, 12], "x": 15.5, "y": 3, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 0.5, "y": 4},
-                {"matrix": [0, 10], "x": 1.5, "y": 4},
-                {"matrix": [0, 15], "x": 2.5, "y": 4},
-
-                {"matrix": [3, 6], "x": 13.5, "y": 4},
-                {"matrix": [0, 14], "x": 14.5, "y": 4},
-                {"matrix": [3, 7], "x": 15.5, "y": 4},
-
-                {"matrix": [14, 4], "x": 5.5, "y": 5, "h": 2},
-                {"matrix": [4, 9], "x": 6.5, "y": 5},
-
-                {"matrix": [4, 11], "x": 9.5, "y": 5},
-                {"matrix": [14, 0], "x": 10.5, "y": 5, "h": 2},
-
-                {"matrix": [14, 5], "x": 6.5, "y": 6},
-
-                {"matrix": [14, 1], "x": 9.5, "y": 6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/sirius/unigo66/keyboard.json b/keyboards/sirius/unigo66/keyboard.json
new file mode 100644
index 00000000000..ac683a0f1db
--- /dev/null
+++ b/keyboards/sirius/unigo66/keyboard.json
@@ -0,0 +1,190 @@
+{
+    "keyboard_name": "UniGo66",
+    "manufacturer": "Sirius",
+    "url": "https://discord.gg/GJ8bdM",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1001",
+        "device_version": "19.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": false,
+        "usb_hid": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [2, 9], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [1, 14], "x": 1.5, "y": 0},
+                {"matrix": [1, 15], "x": 2.5, "y": 0},
+                {"matrix": [2, 0], "x": 3.5, "y": 0},
+                {"matrix": [2, 1], "x": 4.5, "y": 0},
+                {"matrix": [2, 2], "x": 5.5, "y": 0},
+                {"matrix": [2, 13], "x": 6.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 9.5, "y": 0},
+                {"matrix": [2, 3], "x": 10.5, "y": 0},
+                {"matrix": [2, 4], "x": 11.5, "y": 0},
+                {"matrix": [2, 5], "x": 12.5, "y": 0},
+                {"matrix": [2, 6], "x": 13.5, "y": 0},
+                {"matrix": [2, 7], "x": 14.5, "y": 0},
+                {"matrix": [2, 10], "x": 15.5, "y": 0, "w": 1.5},
+
+                {"matrix": [2, 11], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 1},
+                {"matrix": [1, 10], "x": 2.5, "y": 1},
+                {"matrix": [0, 8], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+                {"matrix": [4, 11], "x": 6.5, "y": 1, "h": 1.5},
+
+                {"matrix": [2, 15], "x": 9.5, "y": 1, "h": 1.5},
+                {"matrix": [1, 12], "x": 10.5, "y": 1},
+                {"matrix": [1, 8], "x": 11.5, "y": 1},
+                {"matrix": [0, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 2], "x": 13.5, "y": 1},
+                {"matrix": [1, 3], "x": 14.5, "y": 1},
+                {"matrix": [3, 1], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 9], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [0, 4], "x": 1.5, "y": 2},
+                {"matrix": [1, 6], "x": 2.5, "y": 2},
+                {"matrix": [0, 7], "x": 3.5, "y": 2},
+                {"matrix": [0, 9], "x": 4.5, "y": 2},
+                {"matrix": [0, 10], "x": 5.5, "y": 2},
+
+                {"matrix": [0, 11], "x": 10.5, "y": 2},
+                {"matrix": [0, 13], "x": 11.5, "y": 2},
+                {"matrix": [0, 14], "x": 12.5, "y": 2},
+                {"matrix": [0, 15], "x": 13.5, "y": 2},
+                {"matrix": [3, 3], "x": 14.5, "y": 2},
+                {"matrix": [3, 4], "x": 15.5, "y": 2, "w": 1.5},
+
+                {"matrix": [14, 1], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [1, 13], "x": 1.5, "y": 3},
+                {"matrix": [1, 11], "x": 2.5, "y": 3},
+                {"matrix": [0, 6], "x": 3.5, "y": 3},
+                {"matrix": [1, 9], "x": 4.5, "y": 3},
+                {"matrix": [0, 5], "x": 5.5, "y": 3},
+                {"matrix": [4, 14], "x": 6.5, "y": 2.5, "h": 1.5},
+
+                {"matrix": [3, 0], "x": 9.5, "y": 2.5, "h": 1.5},
+                {"matrix": [1, 1], "x": 10.5, "y": 3},
+                {"matrix": [1, 0], "x": 11.5, "y": 3},
+                {"matrix": [3, 6], "x": 12.5, "y": 3},
+                {"matrix": [3, 7], "x": 13.5, "y": 3},
+                {"matrix": [5, 2], "x": 14.5, "y": 3},
+                {"matrix": [14, 5], "x": 15.5, "y": 3, "w": 1.5},
+
+                {"matrix": [14, 0], "x": 0.5, "y": 4},
+                {"matrix": [14, 3], "x": 1.5, "y": 4},
+                {"matrix": [14, 2], "x": 2.5, "y": 4},
+                {"matrix": [5, 0], "x": 13.5, "y": 4},
+                {"matrix": [5, 1], "x": 14.5, "y": 4},
+                {"matrix": [4, 15], "x": 15.5, "y": 4},
+
+                {"matrix": [2, 12], "x": 5.5, "y": 5},
+                {"matrix": [4, 9], "x": 6.5, "y": 5},
+
+                {"matrix": [4, 10], "x": 9.5, "y": 5},
+                {"matrix": [2, 8], "x": 10.5, "y": 5},
+
+                {"matrix": [14, 6], "x": 5.5, "y": 6},
+                {"matrix": [4, 12], "x": 6.5, "y": 6},
+
+                {"matrix": [4, 13], "x": 9.5, "y": 6},
+                {"matrix": [14, 4], "x": 10.5, "y": 6}
+            ]
+        },
+        "LAYOUT_beta_pcb": {
+            "layout": [
+                {"matrix": [1, 13], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [1, 14], "x": 1.5, "y": 0},
+                {"matrix": [3, 0], "x": 2.5, "y": 0},
+                {"matrix": [2, 15], "x": 3.5, "y": 0},
+                {"matrix": [4, 5], "x": 4.5, "y": 0},
+                {"matrix": [3, 11], "x": 5.5, "y": 0},
+                {"matrix": [14, 6], "x": 6.5, "y": 0},
+
+                {"matrix": [14, 2], "x": 9.5, "y": 0},
+                {"matrix": [3, 10], "x": 10.5, "y": 0},
+                {"matrix": [3, 9], "x": 11.5, "y": 0},
+                {"matrix": [1, 4], "x": 12.5, "y": 0},
+                {"matrix": [0, 4], "x": 13.5, "y": 0},
+                {"matrix": [0, 9], "x": 14.5, "y": 0},
+                {"matrix": [0, 7], "x": 15.5, "y": 0, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 1.5, "y": 1},
+                {"matrix": [3, 12], "x": 2.5, "y": 1},
+                {"matrix": [3, 13], "x": 3.5, "y": 1},
+                {"matrix": [3, 14], "x": 4.5, "y": 1},
+                {"matrix": [3, 15], "x": 5.5, "y": 1},
+                {"matrix": [5, 8], "x": 6.5, "y": 1, "h": 1.5},
+
+                {"matrix": [5, 0], "x": 9.5, "y": 1, "h": 1.5},
+                {"matrix": [2, 12], "x": 10.5, "y": 1},
+                {"matrix": [1, 1], "x": 11.5, "y": 1},
+                {"matrix": [0, 5], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1},
+                {"matrix": [1, 0], "x": 14.5, "y": 1},
+                {"matrix": [0, 6], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [5, 15], "x": 1.5, "y": 2},
+                {"matrix": [5, 14], "x": 2.5, "y": 2},
+                {"matrix": [6, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 10], "x": 4.5, "y": 2},
+                {"matrix": [3, 8], "x": 5.5, "y": 2},
+
+                {"matrix": [4, 12], "x": 10.5, "y": 2},
+                {"matrix": [5, 7], "x": 11.5, "y": 2},
+                {"matrix": [5, 3], "x": 12.5, "y": 2},
+                {"matrix": [5, 11], "x": 13.5, "y": 2},
+                {"matrix": [5, 10], "x": 14.5, "y": 2},
+                {"matrix": [0, 8], "x": 15.5, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 5], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [5, 13], "x": 1.5, "y": 3},
+                {"matrix": [1, 7], "x": 2.5, "y": 3},
+                {"matrix": [1, 11], "x": 3.5, "y": 3},
+                {"matrix": [1, 10], "x": 4.5, "y": 3},
+                {"matrix": [5, 2], "x": 5.5, "y": 3},
+                {"matrix": [5, 6], "x": 6.5, "y": 2.5, "h": 1.5},
+
+                {"matrix": [5, 1], "x": 9.5, "y": 2.5, "h": 1.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 3},
+                {"matrix": [2, 3], "x": 11.5, "y": 3},
+                {"matrix": [1, 12], "x": 12.5, "y": 3},
+                {"matrix": [1, 3], "x": 13.5, "y": 3},
+                {"matrix": [2, 14], "x": 14.5, "y": 3},
+                {"matrix": [0, 12], "x": 15.5, "y": 3, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 0.5, "y": 4},
+                {"matrix": [0, 10], "x": 1.5, "y": 4},
+                {"matrix": [0, 15], "x": 2.5, "y": 4},
+
+                {"matrix": [3, 6], "x": 13.5, "y": 4},
+                {"matrix": [0, 14], "x": 14.5, "y": 4},
+                {"matrix": [3, 7], "x": 15.5, "y": 4},
+
+                {"matrix": [14, 4], "x": 5.5, "y": 5, "h": 2},
+                {"matrix": [4, 9], "x": 6.5, "y": 5},
+
+                {"matrix": [4, 11], "x": 9.5, "y": 5},
+                {"matrix": [14, 0], "x": 10.5, "y": 5, "h": 2},
+
+                {"matrix": [14, 5], "x": 6.5, "y": 6},
+
+                {"matrix": [14, 1], "x": 9.5, "y": 6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sirius/unigo66/rules.mk b/keyboards/sirius/unigo66/rules.mk
index 6cf02169cf6..56889eab51a 100644
--- a/keyboards/sirius/unigo66/rules.mk
+++ b/keyboards/sirius/unigo66/rules.mk
@@ -1,18 +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
-
-USB_HID_ENABLE = yes
-
 CUSTOM_MATRIX = yes
 SRC += custom_matrix.cpp\
 	main.c
diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/info.json
deleted file mode 100644
index 247b255a363..00000000000
--- a/keyboards/sixkeyboard/info.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "keyboard_name": "SixKeyBoard",
-  "manufacturer": "TechKeys",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x746B",
-    "pid": "0x736B",
-    "device_version": "0.0.1",
-    "force_nkro": true
-  },
-  "processor": "atmega16u2",
-  "bootloader": "atmel-dfu",
-  "community_layouts": ["ortho_2x3"],
-  "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}
-      ]
-    }
-  }
-}
diff --git a/keyboards/sixkeyboard/keyboard.json b/keyboards/sixkeyboard/keyboard.json
new file mode 100644
index 00000000000..aff5c985f79
--- /dev/null
+++ b/keyboards/sixkeyboard/keyboard.json
@@ -0,0 +1,34 @@
+{
+  "keyboard_name": "SixKeyBoard",
+  "manufacturer": "TechKeys",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x746B",
+    "pid": "0x736B",
+    "device_version": "0.0.1",
+    "force_nkro": true
+  },
+  "features": {
+    "bootmagic": false,
+    "extrakey": false,
+    "mousekey": false,
+    "nkro": false
+  },
+  "processor": "atmega16u2",
+  "bootloader": "atmel-dfu",
+  "community_layouts": ["ortho_2x3"],
+  "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}
+      ]
+    }
+  }
+}
diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk
index d1d7bc48818..09c02c88b0d 100644
--- a/keyboards/sixkeyboard/rules.mk
+++ b/keyboards/sixkeyboard/rules.mk
@@ -1,14 +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 = no		# Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no	# Enable keyboard backlight functionality
-AUDIO_ENABLE = no
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h
deleted file mode 100644
index a463c64167e..00000000000
--- a/keyboards/skergo/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (C) 2021  Keyz.io Ltd.
-*
-* 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
diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json
deleted file mode 100644
index 0e68b6aedd7..00000000000
--- a/keyboards/skergo/info.json
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-    "keyboard_name": "SKErgo",
-    "manufacturer": "Keyzio",
-    "url": "https://keyz.io",
-    "maintainer": "kevinzhao-tech",
-    "usb": {
-        "vid": "0x4B49",
-        "pid": "0x534B",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7"],
-        "rows": ["B0", "B4", "B3", "B2", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_2u_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
-                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "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.25},
-                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
-                {"matrix": [0, 14], "x": 14.75, "y": 0.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 17, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
-                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
-                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
-                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
-
-                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
-                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
-                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
-                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
-                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
-                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
-                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
-                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 17.15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
-
-                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 17.25, "y": 2},
-
-                {"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": [4, 6], "x": 8.25, "y": 3.25},
-                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
-                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
-
-                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
-                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
-
-                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
-                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
-                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
-            ]
-        },
-        "LAYOUT_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
-                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "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.25},
-                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
-                {"matrix": [0, 13], "x": 14.75, "y": 0.25},
-                {"matrix": [0, 14], "x": 15.75, "y": 0.25},
-
-                {"matrix": [1, 14], "x": 17, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
-                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
-                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
-                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
-
-                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
-                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
-                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
-                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
-                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
-                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
-                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
-                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 17.15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
-
-                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 17.25, "y": 2},
-
-                {"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": [4, 6], "x": 8.25, "y": 3.25},
-                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
-                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
-
-                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
-                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
-
-                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
-                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
-                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/skergo/keyboard.json b/keyboards/skergo/keyboard.json
new file mode 100644
index 00000000000..49ff7b81b6e
--- /dev/null
+++ b/keyboards/skergo/keyboard.json
@@ -0,0 +1,206 @@
+{
+    "keyboard_name": "SKErgo",
+    "manufacturer": "Keyzio",
+    "url": "https://keyz.io",
+    "maintainer": "kevinzhao-tech",
+    "usb": {
+        "vid": "0x4B49",
+        "pid": "0x534B",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7"],
+        "rows": ["B0", "B4", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_2u_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "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.25},
+                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+                {"matrix": [0, 14], "x": 14.75, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
+                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 17.25, "y": 2},
+
+                {"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": [4, 6], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
+                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
+            ]
+        },
+        "LAYOUT_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "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.25},
+                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+                {"matrix": [0, 13], "x": 14.75, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.75, "y": 0.25},
+
+                {"matrix": [1, 14], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
+                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 17.25, "y": 2},
+
+                {"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": [4, 6], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
+                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk
index 1e9f9255447..c2ee0bc86f9 100644
--- a/keyboards/skergo/rules.mk
+++ b/keyboards/skergo/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/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h
deleted file mode 100644
index b352868d2d4..00000000000
--- a/keyboards/skippys_custom_pcs/rooboard65/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.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 less important options */
-
-/*
- * 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/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json
deleted file mode 100644
index b6151a303c4..00000000000
--- a/keyboards/skippys_custom_pcs/rooboard65/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-    "keyboard_name": "Rooboard65",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x36B6",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 68,
-        "max_brightness": 96,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "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": [2, 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": [1, 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/skippys_custom_pcs/rooboard65/keyboard.json b/keyboards/skippys_custom_pcs/rooboard65/keyboard.json
new file mode 100644
index 00000000000..527884714b2
--- /dev/null
+++ b/keyboards/skippys_custom_pcs/rooboard65/keyboard.json
@@ -0,0 +1,134 @@
+{
+    "keyboard_name": "Rooboard65",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com/",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x36B6",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 68,
+        "max_brightness": 96,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "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": [2, 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": [1, 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/skippys_custom_pcs/rooboard65/rules.mk b/keyboards/skippys_custom_pcs/rooboard65/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/rules.mk
+++ b/keyboards/skippys_custom_pcs/rooboard65/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/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json
deleted file mode 100644
index c44fcd1541f..00000000000
--- a/keyboards/skippys_custom_pcs/roopad/info.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "keyboard_name": "RooPad",
-    "manufacturer": "ToastyStoemp",
-    "url": "",
-    "maintainer": "ToastyStoemp",
-    "usb": {
-        "vid": "0x36B6",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 21,
-        "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": "B6"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B4", "D7", "D6", "D4"],
-        "rows": ["B5", "F6", "F5", "F4", "F1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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": [1, 0], "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, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "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": [3, 0], "x": 0, "y": 3},
-                {"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, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 2},
-                {"matrix": [4, 3], "x": 3.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/skippys_custom_pcs/roopad/keyboard.json b/keyboards/skippys_custom_pcs/roopad/keyboard.json
new file mode 100644
index 00000000000..0da722ff120
--- /dev/null
+++ b/keyboards/skippys_custom_pcs/roopad/keyboard.json
@@ -0,0 +1,75 @@
+{
+    "keyboard_name": "RooPad",
+    "manufacturer": "ToastyStoemp",
+    "url": "",
+    "maintainer": "ToastyStoemp",
+    "usb": {
+        "vid": "0x36B6",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 21,
+        "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": "B6"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B4", "D7", "D6", "D4"],
+        "rows": ["B5", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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": [1, 0], "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, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "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": [3, 0], "x": 0, "y": 3},
+                {"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, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 2},
+                {"matrix": [4, 3], "x": 3.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/skippys_custom_pcs/roopad/rules.mk b/keyboards/skippys_custom_pcs/roopad/rules.mk
index d280d696f53..3437a35bdf1 100644
--- a/keyboards/skippys_custom_pcs/roopad/rules.mk
+++ b/keyboards/skippys_custom_pcs/roopad/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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/skmt/15k/info.json b/keyboards/skmt/15k/info.json
deleted file mode 100644
index 903a13b985e..00000000000
--- a/keyboards/skmt/15k/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "manufacturer": "SKMT",
-    "keyboard_name": "SKMT 15k",
-    "maintainer": "satorusaka",
-    "bootloader": "rp2040",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true
-    },
-    "matrix_pins": {
-        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6"],
-        "rows": ["GP7", "GP8", "GP9"]
-    },
-    "processor": "RP2040",
-    "url": "https://github.com/satorusaka/15k-macropad",
-    "usb": {
-        "device_version": "1.1.0",
-        "pid": "0x3488",
-        "vid": "0xFEFE",
-        "force_nkro": true
-    },
-    "layouts": {
-        "LAYOUT_default": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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}
-            ]
-        }
-    },
-    "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": [
-            {"flags": 4, "matrix": [2, 4], "x": 224, "y": 64},
-            {"flags": 4, "matrix": [2, 3], "x": 168, "y": 64},
-            {"flags": 4, "matrix": [2, 2], "x": 112, "y": 64},
-            {"flags": 4, "matrix": [2, 1], "x": 56, "y": 64},
-            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 64},
-            {"flags": 4, "matrix": [1, 4], "x": 224, "y": 32},
-            {"flags": 4, "matrix": [1, 3], "x": 168, "y": 32},
-            {"flags": 4, "matrix": [1, 2], "x": 112, "y": 32},
-            {"flags": 4, "matrix": [1, 1], "x": 56, "y": 32},
-            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 32},
-            {"flags": 4, "matrix": [0, 4], "x": 224, "y": 0},
-            {"flags": 4, "matrix": [0, 3], "x": 168, "y": 0},
-            {"flags": 4, "matrix": [0, 2], "x": 112, "y": 0},
-            {"flags": 4, "matrix": [0, 1], "x": 56, "y": 0},
-            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}
-        ],
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "GP1",
-        "driver": "vendor"
-    }
-}
diff --git a/keyboards/skmt/15k/keyboard.json b/keyboards/skmt/15k/keyboard.json
new file mode 100644
index 00000000000..9cf215f4d48
--- /dev/null
+++ b/keyboards/skmt/15k/keyboard.json
@@ -0,0 +1,122 @@
+{
+    "manufacturer": "SKMT",
+    "keyboard_name": "SKMT 15k",
+    "maintainer": "satorusaka",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6"],
+        "rows": ["GP7", "GP8", "GP9"]
+    },
+    "processor": "RP2040",
+    "url": "https://github.com/satorusaka/15k-macropad",
+    "usb": {
+        "device_version": "1.1.0",
+        "pid": "0x3488",
+        "vid": "0xFEFE",
+        "force_nkro": true
+    },
+    "layouts": {
+        "LAYOUT_default": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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}
+            ]
+        }
+    },
+    "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": [
+            {"flags": 4, "matrix": [2, 4], "x": 224, "y": 64},
+            {"flags": 4, "matrix": [2, 3], "x": 168, "y": 64},
+            {"flags": 4, "matrix": [2, 2], "x": 112, "y": 64},
+            {"flags": 4, "matrix": [2, 1], "x": 56, "y": 64},
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 64},
+            {"flags": 4, "matrix": [1, 4], "x": 224, "y": 32},
+            {"flags": 4, "matrix": [1, 3], "x": 168, "y": 32},
+            {"flags": 4, "matrix": [1, 2], "x": 112, "y": 32},
+            {"flags": 4, "matrix": [1, 1], "x": 56, "y": 32},
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 32},
+            {"flags": 4, "matrix": [0, 4], "x": 224, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 168, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 112, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 56, "y": 0},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}
+        ],
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "GP1",
+        "driver": "vendor"
+    }
+}
diff --git a/keyboards/skmt/15k/rules.mk b/keyboards/skmt/15k/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/skmt/15k/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json
deleted file mode 100644
index d5a64f465ad..00000000000
--- a/keyboards/smallkeyboard/info.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "keyboard_name": "smallkeyboard",
-  "manufacturer": "zhouqiong19840119",
-  "url": "",
-  "maintainer": "zhouqiong19840119",
-  "usb": {
-    "vid": "0x7A71",
-    "pid": "0x736B",
-    "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,
-      "typing_heatmap": true,
-      "solid_reactive_simple": true,
-      "solid_reactive": true
-    },
-    "driver": "is31fl3731",
-    "sleep": true
-  },
-  "matrix_pins": {
-    "cols": ["F7", "F6", "F5"],
-    "rows": ["C7", "C6"]
-  },
-  "diode_direction": "ROW2COL",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "debounce": 3,
-  "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}
-      ]
-    }
-  }
-}
diff --git a/keyboards/smallkeyboard/keyboard.json b/keyboards/smallkeyboard/keyboard.json
new file mode 100644
index 00000000000..9963d83a47f
--- /dev/null
+++ b/keyboards/smallkeyboard/keyboard.json
@@ -0,0 +1,71 @@
+{
+  "keyboard_name": "smallkeyboard",
+  "manufacturer": "zhouqiong19840119",
+  "url": "",
+  "maintainer": "zhouqiong19840119",
+  "usb": {
+    "vid": "0x7A71",
+    "pid": "0x736B",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false,
+    "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,
+      "typing_heatmap": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true
+    },
+    "driver": "is31fl3731",
+    "sleep": true
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "ROW2COL",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "debounce": 3,
+  "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}
+      ]
+    }
+  }
+}
diff --git a/keyboards/smallkeyboard/rules.mk b/keyboards/smallkeyboard/rules.mk
deleted file mode 100644
index 1dcdf891550..00000000000
--- a/keyboards/smallkeyboard/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
-
-RGB_MATRIX_ENABLE = yes
-
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json
deleted file mode 100644
index 3fb14989d69..00000000000
--- a/keyboards/smithrune/iron160/iron160_h/info.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-    "keyboard_name": "I160-H",
-    "manufacturer": "SmithRune",
-    "url": "",
-    "maintainer": "Gondolindrim",
-    "usb": {
-        "vid": "0x8384",
-        "pid": "0x1648",
-        "device_version": "0.0.1"
-    },
-   "processor": "STM32F072",
-   "bootloader": "stm32-dfu",
-   "matrix_pins": {
-       "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"],
-       "rows": ["A10", "A15", "C13", "A7", "B0"]
-   },
-   "ws2812": {
-       "pin": "B15"
-   },
-    "rgblight": {
-        "led_count": 1,
-        "default": {
-           "val": 50
-        }
-    },
-   "diode_direction": "COL2ROW",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_60_tsangan_hhkb"
-    },
-    "community_layouts": [
-        "60_tsangan_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": "Bspc", "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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/smithrune/iron160/iron160_h/keyboard.json b/keyboards/smithrune/iron160/iron160_h/keyboard.json
new file mode 100644
index 00000000000..d9ada0879d5
--- /dev/null
+++ b/keyboards/smithrune/iron160/iron160_h/keyboard.json
@@ -0,0 +1,182 @@
+{
+    "keyboard_name": "I160-H",
+    "manufacturer": "SmithRune",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x8384",
+        "pid": "0x1648",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+   "processor": "STM32F072",
+   "bootloader": "stm32-dfu",
+   "matrix_pins": {
+       "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"],
+       "rows": ["A10", "A15", "C13", "A7", "B0"]
+   },
+   "ws2812": {
+       "pin": "B15"
+   },
+    "rgblight": {
+        "led_count": 1,
+        "default": {
+           "val": 50
+        }
+    },
+   "diode_direction": "COL2ROW",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": [
+        "60_tsangan_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": "Bspc", "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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/smithrune/iron160/iron160_h/rules.mk b/keyboards/smithrune/iron160/iron160_h/rules.mk
index c889da168d6..4138455538f 100644
--- a/keyboards/smithrune/iron160/iron160_h/rules.mk
+++ b/keyboards/smithrune/iron160/iron160_h/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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no
-LTO_ENABLE = no
-
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = legacy
-
diff --git a/keyboards/smithrune/iron160/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/info.json
deleted file mode 100644
index 91c66a3d4fb..00000000000
--- a/keyboards/smithrune/iron160/iron160_s/info.json
+++ /dev/null
@@ -1,674 +0,0 @@
-{
-    "keyboard_name": "I160-S",
-    "manufacturer": "SmithRune",
-    "url": "",
-    "maintainer": "Gondolindrim",
-    "usb": {
-        "vid": "0x8384",
-        "pid": "0x1653",
-        "device_version": "0.0.1"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "matrix_pins": {
-        "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"],
-        "rows": ["A10", "A15", "C13", "B1", "B10"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "A7",
-        "levels": 20,
-        "breathing": true,
-        "breathing_period": 3
-    },
-    "indicators": {
-        "caps_lock": "B0"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_all"
-    },
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "~", "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 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", "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, "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": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "~", "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": "Bspc", "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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "~", "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "~", "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": "Bspc", "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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "~", "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"label": "~", "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": "Bspc", "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", "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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "~", "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "]", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps", "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, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"label": "~", "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": "Bspc", "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", "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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "~", "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "]", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps", "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, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/smithrune/iron160/iron160_s/keyboard.json b/keyboards/smithrune/iron160/iron160_s/keyboard.json
new file mode 100644
index 00000000000..b2a465399f5
--- /dev/null
+++ b/keyboards/smithrune/iron160/iron160_s/keyboard.json
@@ -0,0 +1,682 @@
+{
+    "keyboard_name": "I160-S",
+    "manufacturer": "SmithRune",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x8384",
+        "pid": "0x1653",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"],
+        "rows": ["A10", "A15", "C13", "B1", "B10"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "A7",
+        "levels": 20,
+        "breathing": true,
+        "breathing_period": 3
+    },
+    "indicators": {
+        "caps_lock": "B0"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "~", "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 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", "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, "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": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "~", "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": "Bspc", "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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "~", "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "~", "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": "Bspc", "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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "~", "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 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", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "~", "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": "Bspc", "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", "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "~", "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "]", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps", "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "~", "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": "Bspc", "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", "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "~", "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "]", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps", "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/smithrune/iron160/iron160_s/rules.mk b/keyboards/smithrune/iron160/iron160_s/rules.mk
index 2c863bbe31a..4138455538f 100644
--- a/keyboards/smithrune/iron160/iron160_s/rules.mk
+++ b/keyboards/smithrune/iron160/iron160_s/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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no
-LTO_ENABLE = no
-
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = legacy
-
diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json
deleted file mode 100644
index 2cbbaa84f3f..00000000000
--- a/keyboards/smithrune/iron165r2/f072/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "backlight": {
-        "pin": "A6",
-        "levels": 20,
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 22,
-        "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": 0
-        }
-    },
-    "ws2812": {
-        "pin": "B15"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/smithrune/iron165r2/f072/keyboard.json b/keyboards/smithrune/iron165r2/f072/keyboard.json
new file mode 100644
index 00000000000..e16493d0b5c
--- /dev/null
+++ b/keyboards/smithrune/iron165r2/f072/keyboard.json
@@ -0,0 +1,42 @@
+{
+    "build": {
+        "lto": false
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "backlight": {
+        "pin": "A6",
+        "levels": 20,
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 22,
+        "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": 0
+        }
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu"
+}
diff --git a/keyboards/smithrune/iron165r2/f072/rules.mk b/keyboards/smithrune/iron165r2/f072/rules.mk
deleted file mode 100644
index b524e61f4bb..00000000000
--- a/keyboards/smithrune/iron165r2/f072/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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # USB Nkey Rollover
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = no
-ENCODER_ENABLE = no
-BACKLIGHT_ENABLE = yes
-
diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json
deleted file mode 100644
index ff685e3cdd8..00000000000
--- a/keyboards/smithrune/iron165r2/f411/info.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "eeprom": {
-        "driver": "i2c"
-    },
-    "backlight": {
-        "pin": "A6",
-        "levels": 20,
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 22,
-        "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": 0
-        }
-    },
-    "ws2812": {
-        "pin": "B15",
-        "driver": "pwm"
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/smithrune/iron165r2/f411/keyboard.json b/keyboards/smithrune/iron165r2/f411/keyboard.json
new file mode 100644
index 00000000000..d3d4b3de506
--- /dev/null
+++ b/keyboards/smithrune/iron165r2/f411/keyboard.json
@@ -0,0 +1,46 @@
+{
+    "build": {
+        "lto": false
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "backlight": {
+        "pin": "A6",
+        "levels": 20,
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 22,
+        "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": 0
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "pwm"
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu"
+}
diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk
deleted file mode 100644
index f5a58ab0cb7..00000000000
--- a/keyboards/smithrune/iron165r2/f411/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 = yes           # USB Nkey Rollover
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = no
-ENCODER_ENABLE = no
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/snes_macropad/info.json b/keyboards/snes_macropad/keyboard.json
similarity index 100%
rename from keyboards/snes_macropad/info.json
rename to keyboards/snes_macropad/keyboard.json
diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h
deleted file mode 100644
index f608132b5af..00000000000
--- a/keyboards/soda/cherish/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/soda/cherish/info.json b/keyboards/soda/cherish/info.json
deleted file mode 100644
index 1284c79ce4a..00000000000
--- a/keyboards/soda/cherish/info.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-    "keyboard_name": "Cherish-75",
-    "url": "",
-    "maintainer": "gezhaoyou",
-    "manufacturer": "gezhaoyou",
-    "usb": {
-        "vid": "0xEB50",
-        "pid": "0xEB52",
-        "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": "A13"
-    },
-    "matrix_pins": {
-        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
-        "rows": ["A7", "B0", "B1", "B2", "B10", "B11"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_75_ansi": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "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": 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.5, "y": 0},
-                {"matrix": [0, 10], "x": 11.5, "y": 0},
-                {"matrix": [0, 11], "x": 12.5, "y": 0},
-                {"matrix": [0, 12], "x": 13.5, "y": 0},
-
-                {"matrix": [0, 14], "x": 15, "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, "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, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 12], "x": 14, "y": 4.25},
-                {"matrix": [4, 14], "x": 15, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 11], "x": 13, "y": 5.25},
-                {"matrix": [5, 12], "x": 14, "y": 5.25},
-                {"matrix": [5, 14], "x": 15, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/soda/cherish/keyboard.json b/keyboards/soda/cherish/keyboard.json
new file mode 100644
index 00000000000..b256e939651
--- /dev/null
+++ b/keyboards/soda/cherish/keyboard.json
@@ -0,0 +1,153 @@
+{
+    "keyboard_name": "Cherish-75",
+    "url": "",
+    "maintainer": "gezhaoyou",
+    "manufacturer": "gezhaoyou",
+    "usb": {
+        "vid": "0xEB50",
+        "pid": "0xEB52",
+        "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": {
+        "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": "A13"
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+        "rows": ["A7", "B0", "B1", "B2", "B10", "B11"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_75_ansi": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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": 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.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 15, "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, "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, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 12], "x": 14, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 11], "x": 13, "y": 5.25},
+                {"matrix": [5, 12], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/soda/cherish/rules.mk b/keyboards/soda/cherish/rules.mk
index a8af2d4ebca..04fe1eba2ac 100644
--- a/keyboards/soda/cherish/rules.mk
+++ b/keyboards/soda/cherish/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
-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/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
deleted file mode 100755
index 6638498e0c6..00000000000
--- a/keyboards/spaceholdings/nebula12/info.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "keyboard_name": "NEBULA12",
-    "manufacturer": "Yiancar-Designs",
-    "url": "",
-    "maintainer": "yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x5337",
-        "device_version": "0.0.1"
-    },
-    "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": "B15",
-        "driver": "spi"
-    },
-    "matrix_pins": {
-        "cols": ["A9", "C13", "C14"],
-        "rows": ["A8", "C15", "A0", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "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": [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/spaceholdings/nebula12/keyboard.json b/keyboards/spaceholdings/nebula12/keyboard.json
new file mode 100755
index 00000000000..2b170e8e618
--- /dev/null
+++ b/keyboards/spaceholdings/nebula12/keyboard.json
@@ -0,0 +1,67 @@
+{
+    "keyboard_name": "NEBULA12",
+    "manufacturer": "Yiancar-Designs",
+    "url": "",
+    "maintainer": "yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x5337",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "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": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["A9", "C13", "C14"],
+        "rows": ["A8", "C15", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "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": [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/spaceholdings/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk
index a0b1795cee0..dd548eee148 100755
--- a/keyboards/spaceholdings/nebula12/rules.mk
+++ b/keyboards/spaceholdings/nebula12/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-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
-AUDIO_ENABLE = no                  # Audio output
-RGBLIGHT_ENABLE = yes              # Underglow RGB
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC +=  keyboards/wilba_tech/wt_main.c \
         keyboards/wilba_tech/wt_rgb_backlight.c \
         drivers/led/issi/is31fl3731.c \
         quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json
deleted file mode 100755
index dfc61b3a2d1..00000000000
--- a/keyboards/spaceholdings/nebula68/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "keyboard_name": "NEBULA68",
-    "manufacturer": "Yiancar-Designs",
-    "url": "",
-    "maintainer": "yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x5336",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "A7",
-        "driver": "pwm"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 10,
-        "max_brightness": 210,
-        "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": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
-        "rows": ["B3", "B4", "B5", "A8", "A4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "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/nebula68/keyboard.json b/keyboards/spaceholdings/nebula68/keyboard.json
new file mode 100755
index 00000000000..47cab7a5b02
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68/keyboard.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "NEBULA68",
+    "manufacturer": "Yiancar-Designs",
+    "url": "",
+    "maintainer": "yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x5336",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "max_brightness": 210,
+        "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": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
+    "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/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk
index d2484b627c3..c2507bf03df 100755
--- a/keyboards/spaceholdings/nebula68/rules.mk
+++ b/keyboards/spaceholdings/nebula68/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-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
-AUDIO_ENABLE = no                  # Audio output
-RGBLIGHT_ENABLE = yes              # Underglow RGB
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC +=  keyboards/wilba_tech/wt_main.c \
         keyboards/wilba_tech/wt_rgb_backlight.c \
         drivers/led/issi/is31fl3733.c \
         quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/spaceman/pancake/rev1/feather/info.json b/keyboards/spaceman/pancake/rev1/feather/info.json
deleted file mode 100644
index 85f95a011bb..00000000000
--- a/keyboards/spaceman/pancake/rev1/feather/info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["C7", "D6", "B7", "B6", "F0", "D2", "D3", "F1", "F4", "F5", "F6", "F7"],
-        "rows": ["B5", "D7", "C6", "D0"]
-    },
-    "diode_direction": "COL2ROW",
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    }
-}
diff --git a/keyboards/spaceman/pancake/rev1/feather/keyboard.json b/keyboards/spaceman/pancake/rev1/feather/keyboard.json
new file mode 100644
index 00000000000..3b82e3d4999
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev1/feather/keyboard.json
@@ -0,0 +1,19 @@
+{
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "D6", "B7", "B6", "F0", "D2", "D3", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B5", "D7", "C6", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    }
+}
diff --git a/keyboards/spaceman/pancake/rev1/feather/rules.mk b/keyboards/spaceman/pancake/rev1/feather/rules.mk
index 35ad61d4a17..bccd7dfa97e 100644
--- a/keyboards/spaceman/pancake/rev1/feather/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/feather/rules.mk
@@ -1,20 +1,6 @@
 # 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  = yes	# Console for debug
-COMMAND_ENABLE  = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no  # Custom backlighting code is used, so this should not be enabled
-AUDIO_ENABLE  = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE  = no # This can be enabled if a ws2812 strip is connected to the expansion port.
-BLUETOOTH_ENABLE = yes
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/spaceman/pancake/rev1/promicro/info.json b/keyboards/spaceman/pancake/rev1/promicro/info.json
deleted file mode 100644
index 47ab8fdcd0a..00000000000
--- a/keyboards/spaceman/pancake/rev1/promicro/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "E6", "B4", "B5", "D7", "C6", "D4", "D0", "D1"],
-        "rows": ["B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/spaceman/pancake/rev1/promicro/keyboard.json b/keyboards/spaceman/pancake/rev1/promicro/keyboard.json
new file mode 100644
index 00000000000..658eaa39c15
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev1/promicro/keyboard.json
@@ -0,0 +1,15 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "E6", "B4", "B5", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/spaceman/pancake/rev1/promicro/rules.mk b/keyboards/spaceman/pancake/rev1/promicro/rules.mk
index 96e36eba388..16051206467 100644
--- a/keyboards/spaceman/pancake/rev1/promicro/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/promicro/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  = yes	# Console for debug
-COMMAND_ENABLE  = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no  # Custom backlighting code is used, so this should not be enabled
-AUDIO_ENABLE  = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE  = no # This can be enabled if a ws2812 strip is connected to the expansion port.
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json
deleted file mode 100644
index d7d0d8b84d6..00000000000
--- a/keyboards/sparrow62/info.json
+++ /dev/null
@@ -1,99 +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": {
-        "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/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 ab2c49da70e..00000000000
--- a/keyboards/sparrow62/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 = 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/specskeys/config.h b/keyboards/specskeys/config.h
deleted file mode 100644
index 490ac5e5c02..00000000000
--- a/keyboards/specskeys/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 Nico
-
-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/specskeys/info.json b/keyboards/specskeys/info.json
deleted file mode 100644
index eb92e6f34fd..00000000000
--- a/keyboards/specskeys/info.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "keyboard_name": "Specskeys",
-    "manufacturer": "Specs32",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xCAFE",
-        "pid": "0x0080",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6"],
-        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "levels": 1
-    },
-    "indicators": {
-        "caps_lock": "C7",
-        "scroll_lock": "C6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_tkl_iso_tsangan"
-    },
-    "layouts": {
-        "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, 13], "x": 15.5, "y": 0},
-                {"matrix": [0, 14], "x": 16.5, "y": 0},
-                {"matrix": [0, 15], "x": 17.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 0, "y": 2},
-                {"matrix": [1, 0], "x": 1, "y": 2},
-                {"matrix": [1, 1], "x": 2, "y": 2},
-                {"matrix": [1, 2], "x": 3, "y": 2},
-                {"matrix": [1, 3], "x": 4, "y": 2},
-                {"matrix": [1, 4], "x": 5, "y": 2},
-                {"matrix": [1, 5], "x": 6, "y": 2},
-                {"matrix": [1, 6], "x": 7, "y": 2},
-                {"matrix": [1, 7], "x": 8, "y": 2},
-                {"matrix": [1, 8], "x": 9, "y": 2},
-                {"matrix": [1, 9], "x": 10, "y": 2},
-                {"matrix": [1, 10], "x": 11, "y": 2},
-                {"matrix": [1, 11], "x": 12, "y": 2},
-                {"matrix": [1, 12], "x": 13, "y": 2, "w": 2},
-
-                {"matrix": [1, 13], "x": 15.5, "y": 2},
-                {"matrix": [1, 14], "x": 16.5, "y": 2},
-                {"matrix": [1, 15], "x": 17.5, "y": 2},
-
-                {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [2, 0], "x": 1.5, "y": 3},
-                {"matrix": [2, 1], "x": 2.5, "y": 3},
-                {"matrix": [2, 2], "x": 3.5, "y": 3},
-                {"matrix": [2, 3], "x": 4.5, "y": 3},
-                {"matrix": [2, 4], "x": 5.5, "y": 3},
-                {"matrix": [2, 5], "x": 6.5, "y": 3},
-                {"matrix": [2, 6], "x": 7.5, "y": 3},
-                {"matrix": [2, 7], "x": 8.5, "y": 3},
-                {"matrix": [2, 8], "x": 9.5, "y": 3},
-                {"matrix": [2, 9], "x": 10.5, "y": 3},
-                {"matrix": [2, 10], "x": 11.5, "y": 3},
-                {"matrix": [2, 11], "x": 12.5, "y": 3},
-
-                {"matrix": [2, 13], "x": 15.5, "y": 3},
-                {"matrix": [2, 14], "x": 16.5, "y": 3},
-                {"matrix": [2, 15], "x": 17.5, "y": 3},
-
-                {"matrix": [5, 2], "x": 0, "y": 4, "w": 1.75},
-                {"matrix": [3, 0], "x": 1.75, "y": 4},
-                {"matrix": [3, 1], "x": 2.75, "y": 4},
-                {"matrix": [3, 2], "x": 3.75, "y": 4},
-                {"matrix": [3, 3], "x": 4.75, "y": 4},
-                {"matrix": [3, 4], "x": 5.75, "y": 4},
-                {"matrix": [3, 5], "x": 6.75, "y": 4},
-                {"matrix": [3, 6], "x": 7.75, "y": 4},
-                {"matrix": [3, 7], "x": 8.75, "y": 4},
-                {"matrix": [3, 8], "x": 9.75, "y": 4},
-                {"matrix": [3, 9], "x": 10.75, "y": 4},
-                {"matrix": [3, 10], "x": 11.75, "y": 4},
-                {"matrix": [3, 11], "x": 12.75, "y": 4},
-                {"matrix": [2, 12], "x": 13.75, "y": 3, "w": 1.25, "h": 2},
-
-                {"matrix": [5, 3], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [4, 0], "x": 1.25, "y": 5},
-                {"matrix": [4, 1], "x": 2.25, "y": 5},
-                {"matrix": [4, 2], "x": 3.25, "y": 5},
-                {"matrix": [4, 3], "x": 4.25, "y": 5},
-                {"matrix": [4, 4], "x": 5.25, "y": 5},
-                {"matrix": [4, 5], "x": 6.25, "y": 5},
-                {"matrix": [4, 6], "x": 7.25, "y": 5},
-                {"matrix": [4, 7], "x": 8.25, "y": 5},
-                {"matrix": [4, 8], "x": 9.25, "y": 5},
-                {"matrix": [4, 9], "x": 10.25, "y": 5},
-                {"matrix": [4, 10], "x": 11.25, "y": 5},
-                {"matrix": [4, 11], "x": 12.25, "y": 5, "w": 2.75},
-
-                {"matrix": [4, 14], "x": 16.5, "y": 5},
-
-                {"matrix": [5, 4], "x": 0, "y": 6, "w": 1.5},
-                {"matrix": [5, 5], "x": 1.5, "y": 6},
-                {"matrix": [5, 6], "x": 2.5, "y": 6, "w": 1.5},
-                {"matrix": [5, 7], "x": 4, "y": 6, "w": 7},
-                {"matrix": [5, 9], "x": 11, "y": 6, "w": 1.5},
-                {"matrix": [5, 10], "x": 12.5, "y": 6},
-                {"matrix": [5, 11], "x": 13.5, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 13], "x": 15.5, "y": 6},
-                {"matrix": [5, 14], "x": 16.5, "y": 6},
-                {"matrix": [5, 15], "x": 17.5, "y": 6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/specskeys/keyboard.json b/keyboards/specskeys/keyboard.json
new file mode 100644
index 00000000000..104b1ea13d9
--- /dev/null
+++ b/keyboards/specskeys/keyboard.json
@@ -0,0 +1,148 @@
+{
+    "keyboard_name": "Specskeys",
+    "manufacturer": "Specs32",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xCAFE",
+        "pid": "0x0080",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "levels": 1
+    },
+    "indicators": {
+        "caps_lock": "C7",
+        "scroll_lock": "C6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_iso_tsangan"
+    },
+    "layouts": {
+        "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, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.5, "y": 0},
+                {"matrix": [0, 15], "x": 17.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 0, "y": 2},
+                {"matrix": [1, 0], "x": 1, "y": 2},
+                {"matrix": [1, 1], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 3, "y": 2},
+                {"matrix": [1, 3], "x": 4, "y": 2},
+                {"matrix": [1, 4], "x": 5, "y": 2},
+                {"matrix": [1, 5], "x": 6, "y": 2},
+                {"matrix": [1, 6], "x": 7, "y": 2},
+                {"matrix": [1, 7], "x": 8, "y": 2},
+                {"matrix": [1, 8], "x": 9, "y": 2},
+                {"matrix": [1, 9], "x": 10, "y": 2},
+                {"matrix": [1, 10], "x": 11, "y": 2},
+                {"matrix": [1, 11], "x": 12, "y": 2},
+                {"matrix": [1, 12], "x": 13, "y": 2, "w": 2},
+
+                {"matrix": [1, 13], "x": 15.5, "y": 2},
+                {"matrix": [1, 14], "x": 16.5, "y": 2},
+                {"matrix": [1, 15], "x": 17.5, "y": 2},
+
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 3},
+                {"matrix": [2, 1], "x": 2.5, "y": 3},
+                {"matrix": [2, 2], "x": 3.5, "y": 3},
+                {"matrix": [2, 3], "x": 4.5, "y": 3},
+                {"matrix": [2, 4], "x": 5.5, "y": 3},
+                {"matrix": [2, 5], "x": 6.5, "y": 3},
+                {"matrix": [2, 6], "x": 7.5, "y": 3},
+                {"matrix": [2, 7], "x": 8.5, "y": 3},
+                {"matrix": [2, 8], "x": 9.5, "y": 3},
+                {"matrix": [2, 9], "x": 10.5, "y": 3},
+                {"matrix": [2, 10], "x": 11.5, "y": 3},
+                {"matrix": [2, 11], "x": 12.5, "y": 3},
+
+                {"matrix": [2, 13], "x": 15.5, "y": 3},
+                {"matrix": [2, 14], "x": 16.5, "y": 3},
+                {"matrix": [2, 15], "x": 17.5, "y": 3},
+
+                {"matrix": [5, 2], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [3, 0], "x": 1.75, "y": 4},
+                {"matrix": [3, 1], "x": 2.75, "y": 4},
+                {"matrix": [3, 2], "x": 3.75, "y": 4},
+                {"matrix": [3, 3], "x": 4.75, "y": 4},
+                {"matrix": [3, 4], "x": 5.75, "y": 4},
+                {"matrix": [3, 5], "x": 6.75, "y": 4},
+                {"matrix": [3, 6], "x": 7.75, "y": 4},
+                {"matrix": [3, 7], "x": 8.75, "y": 4},
+                {"matrix": [3, 8], "x": 9.75, "y": 4},
+                {"matrix": [3, 9], "x": 10.75, "y": 4},
+                {"matrix": [3, 10], "x": 11.75, "y": 4},
+                {"matrix": [3, 11], "x": 12.75, "y": 4},
+                {"matrix": [2, 12], "x": 13.75, "y": 3, "w": 1.25, "h": 2},
+
+                {"matrix": [5, 3], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [4, 0], "x": 1.25, "y": 5},
+                {"matrix": [4, 1], "x": 2.25, "y": 5},
+                {"matrix": [4, 2], "x": 3.25, "y": 5},
+                {"matrix": [4, 3], "x": 4.25, "y": 5},
+                {"matrix": [4, 4], "x": 5.25, "y": 5},
+                {"matrix": [4, 5], "x": 6.25, "y": 5},
+                {"matrix": [4, 6], "x": 7.25, "y": 5},
+                {"matrix": [4, 7], "x": 8.25, "y": 5},
+                {"matrix": [4, 8], "x": 9.25, "y": 5},
+                {"matrix": [4, 9], "x": 10.25, "y": 5},
+                {"matrix": [4, 10], "x": 11.25, "y": 5},
+                {"matrix": [4, 11], "x": 12.25, "y": 5, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 16.5, "y": 5},
+
+                {"matrix": [5, 4], "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 6},
+                {"matrix": [5, 6], "x": 2.5, "y": 6, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 6, "w": 7},
+                {"matrix": [5, 9], "x": 11, "y": 6, "w": 1.5},
+                {"matrix": [5, 10], "x": 12.5, "y": 6},
+                {"matrix": [5, 11], "x": 13.5, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 15.5, "y": 6},
+                {"matrix": [5, 14], "x": 16.5, "y": 6},
+                {"matrix": [5, 15], "x": 17.5, "y": 6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/specskeys/rules.mk b/keyboards/specskeys/rules.mk
index 05f8c4ece5f..3437a35bdf1 100644
--- a/keyboards/specskeys/rules.mk
+++ b/keyboards/specskeys/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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/info.json
deleted file mode 100644
index e507a668b1d..00000000000
--- a/keyboards/spiderisland/split78/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "Split 78-key",
-    "manufacturer": "SpiderIsland",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xF4E4",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "D4",
-        "breathing": true
-    },
-    "ws2812": {
-        "driver": "i2c"
-    },
-    "build": {
-        "debounce_type": "sym_eager_pr"
-    },
-    "processor": "atmega32a",
-    "bootloader": "bootloadhid",
-    "debounce": 50,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 2, "y": 0},
-                {"matrix": [2, 0], "x": 3, "y": 0},
-                {"matrix": [3, 0], "x": 4, "y": 0},
-                {"matrix": [4, 0], "x": 5, "y": 0},
-
-                {"matrix": [5, 0], "x": 6.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [1, 7], "x": 9.5, "y": 0},
-                {"matrix": [2, 7], "x": 10.5, "y": 0},
-
-                {"matrix": [3, 7], "x": 12, "y": 0},
-                {"matrix": [4, 7], "x": 13, "y": 0},
-                {"matrix": [5, 7], "x": 14, "y": 0},
-                {"matrix": [6, 7], "x": 15, "y": 0},
-
-                {"matrix": [0, 1], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [4, 1], "x": 4, "y": 1.25},
-                {"matrix": [5, 1], "x": 5, "y": 1.25},
-                {"matrix": [5, 5], "x": 6, "y": 1.25},
-
-                {"matrix": [0, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 8], "x": 9, "y": 1.25},
-                {"matrix": [2, 8], "x": 10, "y": 1.25},
-                {"matrix": [3, 8], "x": 11, "y": 1.25},
-                {"matrix": [4, 8], "x": 12, "y": 1.25},
-                {"matrix": [5, 8], "x": 13, "y": 1.25},
-                {"matrix": [6, 8], "x": 14, "y": 1.25, "w": 2},
-
-                {"matrix": [0, 2], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [3, 2], "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": [0, 9], "x": 7.5, "y": 2.25},
-                {"matrix": [1, 9], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [3, 9], "x": 10.5, "y": 2.25},
-                {"matrix": [4, 9], "x": 11.5, "y": 2.25},
-                {"matrix": [5, 9], "x": 12.5, "y": 2.25},
-                {"matrix": [6, 9], "x": 13.5, "y": 2.25},
-                {"matrix": [0, 12], "x": 14.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [0, 3], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [1, 3], "x": 1.75, "y": 3.25},
-                {"matrix": [2, 3], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
-                {"matrix": [5, 3], "x": 5.75, "y": 3.25},
-
-                {"matrix": [0, 10], "x": 7.75, "y": 3.25},
-                {"matrix": [1, 10], "x": 8.75, "y": 3.25},
-                {"matrix": [2, 10], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [5, 10], "x": 11.75, "y": 3.25},
-                {"matrix": [4, 10], "x": 12.75, "y": 3.25},
-                {"matrix": [6, 10], "x": 13.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [0, 4], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [1, 4], "x": 2.25, "y": 4.25},
-                {"matrix": [2, 4], "x": 3.25, "y": 4.25},
-                {"matrix": [3, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [5, 4], "x": 6.25, "y": 4.25},
-
-                {"matrix": [0, 11], "x": 8.25, "y": 4.25},
-                {"matrix": [1, 11], "x": 9.25, "y": 4.25},
-                {"matrix": [2, 11], "x": 10.25, "y": 4.25},
-                {"matrix": [3, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [5, 11], "x": 14, "y": 4.25},
-                {"matrix": [6, 11], "x": 15, "y": 4.25},
-
-                {"matrix": [0, 5], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [1, 5], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [2, 5], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [3, 5], "x": 3.75, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 2.25},
-
-                {"matrix": [1, 12], "x": 8.25, "y": 5.25, "w": 2.25},
-                {"matrix": [2, 12], "x": 10.5, "y": 5.25, "w": 1.25},
-                {"matrix": [3, 12], "x": 11.75, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 5.25},
-                {"matrix": [5, 12], "x": 14, "y": 5.25},
-                {"matrix": [6, 12], "x": 15, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/spiderisland/split78/keyboard.json b/keyboards/spiderisland/split78/keyboard.json
new file mode 100644
index 00000000000..cd49755b0f4
--- /dev/null
+++ b/keyboards/spiderisland/split78/keyboard.json
@@ -0,0 +1,129 @@
+{
+    "keyboard_name": "Split 78-key",
+    "manufacturer": "SpiderIsland",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xF4E4",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "backlight": {
+        "pin": "D4",
+        "breathing": true
+    },
+    "ws2812": {
+        "driver": "i2c"
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
+    "processor": "atmega32a",
+    "bootloader": "bootloadhid",
+    "debounce": 50,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [2, 0], "x": 3, "y": 0},
+                {"matrix": [3, 0], "x": 4, "y": 0},
+                {"matrix": [4, 0], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 6.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [1, 7], "x": 9.5, "y": 0},
+                {"matrix": [2, 7], "x": 10.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 12, "y": 0},
+                {"matrix": [4, 7], "x": 13, "y": 0},
+                {"matrix": [5, 7], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [4, 1], "x": 4, "y": 1.25},
+                {"matrix": [5, 1], "x": 5, "y": 1.25},
+                {"matrix": [5, 5], "x": 6, "y": 1.25},
+
+                {"matrix": [0, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 8], "x": 9, "y": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 1.25},
+                {"matrix": [3, 8], "x": 11, "y": 1.25},
+                {"matrix": [4, 8], "x": 12, "y": 1.25},
+                {"matrix": [5, 8], "x": 13, "y": 1.25},
+                {"matrix": [6, 8], "x": 14, "y": 1.25, "w": 2},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 2], "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": [0, 9], "x": 7.5, "y": 2.25},
+                {"matrix": [1, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.25},
+                {"matrix": [6, 9], "x": 13.5, "y": 2.25},
+                {"matrix": [0, 12], "x": 14.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [1, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
+                {"matrix": [5, 3], "x": 5.75, "y": 3.25},
+
+                {"matrix": [0, 10], "x": 7.75, "y": 3.25},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.25},
+                {"matrix": [2, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [5, 10], "x": 11.75, "y": 3.25},
+                {"matrix": [4, 10], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 10], "x": 13.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [0, 4], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [1, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [2, 4], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [5, 4], "x": 6.25, "y": 4.25},
+
+                {"matrix": [0, 11], "x": 8.25, "y": 4.25},
+                {"matrix": [1, 11], "x": 9.25, "y": 4.25},
+                {"matrix": [2, 11], "x": 10.25, "y": 4.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [5, 11], "x": 14, "y": 4.25},
+                {"matrix": [6, 11], "x": 15, "y": 4.25},
+
+                {"matrix": [0, 5], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 5], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 5], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 2.25},
+
+                {"matrix": [1, 12], "x": 8.25, "y": 5.25, "w": 2.25},
+                {"matrix": [2, 12], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 12], "x": 14, "y": 5.25},
+                {"matrix": [6, 12], "x": 15, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/spiderisland/split78/rules.mk b/keyboards/spiderisland/split78/rules.mk
index db8262a763b..2d02998dd10 100644
--- a/keyboards/spiderisland/split78/rules.mk
+++ b/keyboards/spiderisland/split78/rules.mk
@@ -1,14 +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
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/spleeb/info.json b/keyboards/spleeb/keyboard.json
similarity index 100%
rename from keyboards/spleeb/info.json
rename to keyboards/spleeb/keyboard.json
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
deleted file mode 100644
index 0c6a104c528..00000000000
--- a/keyboards/splitkb/zima/info.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "keyboard_name": "Zima",
-    "manufacturer": "splitkb",
-    "url": "splitkb.com",
-    "maintainer": "splitkb.com, drashna",
-    "usb": {
-        "vid": "0x8D1D",
-        "pid": "0xF75B",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 5,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "static_gradient": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B5"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "D7", "resolution": 2}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "direct": [
-            ["C6", "D6", "D5"],
-            ["C7", "F7", "D4"],
-            ["E6", "F5", "F6"],
-            ["F0", "F1", "F4"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x3": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-                {"x": 1, "y": 0, "matrix": [0, 1]},
-                {"x": 2, "y": 0, "matrix": [0, 2]},
-                {"x": 0, "y": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]},
-                {"x": 0, "y": 2, "matrix": [2, 0]},
-                {"x": 1, "y": 2, "matrix": [2, 1]},
-                {"x": 2, "y": 2, "matrix": [2, 2]},
-                {"x": 0, "y": 3, "matrix": [3, 0]},
-                {"x": 1, "y": 3, "matrix": [3, 1]},
-                {"x": 2, "y": 3, "matrix": [3, 2]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/splitkb/zima/keyboard.json b/keyboards/splitkb/zima/keyboard.json
new file mode 100644
index 00000000000..68892960da7
--- /dev/null
+++ b/keyboards/splitkb/zima/keyboard.json
@@ -0,0 +1,74 @@
+{
+    "keyboard_name": "Zima",
+    "manufacturer": "splitkb",
+    "url": "splitkb.com",
+    "maintainer": "splitkb.com, drashna",
+    "usb": {
+        "vid": "0x8D1D",
+        "pid": "0xF75B",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "D7", "resolution": 2}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["C6", "D6", "D5"],
+            ["C7", "F7", "D4"],
+            ["E6", "F5", "F6"],
+            ["F0", "F1", "F4"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x3": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk
index 3bcfccdd7bd..dea510c2ab3 100644
--- a/keyboards/splitkb/zima/rules.mk
+++ b/keyboards/splitkb/zima/rules.mk
@@ -1,19 +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 = yes         # Audio output
-
-ENCODER_ENABLE = yes       # ENables the use of one or more encoders
-OLED_ENABLE = yes
-HAPTIC_ENABLE = yes        # Supported but not included by defaut
 HAPTIC_DRIVER = drv2605l
-
-LTO_ENABLE = yes
diff --git a/keyboards/sthlmkb/lagom/info.json b/keyboards/sthlmkb/lagom/keyboard.json
similarity index 100%
rename from keyboards/sthlmkb/lagom/info.json
rename to keyboards/sthlmkb/lagom/keyboard.json
diff --git a/keyboards/sthlmkb/lagom/rules.mk b/keyboards/sthlmkb/lagom/rules.mk
index 39bdd537d5d..2e2102e76be 100644
--- a/keyboards/sthlmkb/lagom/rules.mk
+++ b/keyboards/sthlmkb/lagom/rules.mk
@@ -1,8 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-CUSTOM_MATRIX = lite        # Lite custom matrix
-
+CUSTOM_MATRIX = lite
 
 # Project specific files
 SRC += matrix.c
diff --git a/keyboards/stront/info.json b/keyboards/stront/keyboard.json
similarity index 100%
rename from keyboards/stront/info.json
rename to keyboards/stront/keyboard.json
diff --git a/keyboards/supersplit/info.json b/keyboards/supersplit/keyboard.json
similarity index 100%
rename from keyboards/supersplit/info.json
rename to keyboards/supersplit/keyboard.json
diff --git a/keyboards/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/info.json
deleted file mode 100644
index 19d08ee61a5..00000000000
--- a/keyboards/switchplate/southpaw_65/info.json
+++ /dev/null
@@ -1,323 +0,0 @@
-{
-    "keyboard_name": "Southpaw Extended 65%",
-    "manufacturer": "Switchplate Peripherals",
-    "url": "https://geekhack.org/index.php?topic=92344.0",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x4084",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B5",
-        "levels": 10
-    },
-    "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": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-                {"matrix": [0, 16], "x": 16, "y": 0},
-                {"matrix": [0, 17], "x": 17, "y": 0},
-                {"matrix": [4, 13], "x": 18, "y": 0},
-                {"matrix": [0, 18], "x": 19, "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, "w": 1.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "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},
-                {"matrix": [1, 14], "x": 14.5, "y": 1},
-                {"matrix": [1, 15], "x": 15.5, "y": 1},
-                {"matrix": [1, 16], "x": 16.5, "y": 1},
-                {"matrix": [1, 17], "x": 17.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 18], "x": 19, "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, "w": 1.75},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 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},
-                {"matrix": [2, 14], "x": 14.75, "y": 2},
-                {"matrix": [2, 15], "x": 15.75, "y": 2},
-                {"matrix": [2, 16], "x": 16.75, "y": 2},
-                {"matrix": [2, 17], "x": 17.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 18], "x": 19, "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},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 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},
-                {"matrix": [3, 13], "x": 13.25, "y": 3},
-                {"matrix": [3, 14], "x": 14.25, "y": 3},
-                {"matrix": [3, 15], "x": 15.25, "y": 3},
-                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 17], "x": 18, "y": 3},
-                {"matrix": [3, 18], "x": 19, "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": 1.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-                {"matrix": [4, 12], "x": 16, "y": 4},
-                {"matrix": [4, 16], "x": 17, "y": 4},
-                {"matrix": [4, 17], "x": 18, "y": 4},
-                {"matrix": [4, 18], "x": 19, "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": [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, "w": 2},
-                {"matrix": [0, 18], "x": 19, "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, "h": 2},
-                {"matrix": [1, 4], "x": 4, "y": 1, "w": 1.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "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},
-                {"matrix": [1, 14], "x": 14.5, "y": 1},
-                {"matrix": [1, 15], "x": 15.5, "y": 1},
-                {"matrix": [1, 16], "x": 16.5, "y": 1},
-                {"matrix": [1, 17], "x": 17.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 18], "x": 19, "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, 4], "x": 4, "y": 2, "w": 1.75},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 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},
-                {"matrix": [2, 14], "x": 14.75, "y": 2},
-                {"matrix": [2, 15], "x": 15.75, "y": 2},
-                {"matrix": [2, 17], "x": 16.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 18], "x": 19, "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, "h": 2},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 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},
-                {"matrix": [3, 13], "x": 13.25, "y": 3},
-                {"matrix": [3, 14], "x": 14.25, "y": 3},
-                {"matrix": [3, 15], "x": 15.25, "y": 3},
-                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 17], "x": 18, "y": 3},
-                {"matrix": [3, 18], "x": 19, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-                {"matrix": [4, 12], "x": 16, "y": 4},
-                {"matrix": [4, 16], "x": 17, "y": 4},
-                {"matrix": [4, 17], "x": 18, "y": 4},
-                {"matrix": [4, 18], "x": 19, "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": [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, "w": 2},
-                {"matrix": [0, 18], "x": 19, "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, "h": 2},
-                {"matrix": [1, 4], "x": 4, "y": 1, "w": 1.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "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},
-                {"matrix": [1, 14], "x": 14.5, "y": 1},
-                {"matrix": [1, 15], "x": 15.5, "y": 1},
-                {"matrix": [1, 16], "x": 16.5, "y": 1},
-                {"matrix": [1, 18], "x": 19, "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, 4], "x": 4, "y": 2, "w": 1.75},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 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},
-                {"matrix": [2, 14], "x": 14.75, "y": 2},
-                {"matrix": [2, 15], "x": 15.75, "y": 2},
-                {"matrix": [2, 16], "x": 16.75, "y": 2},
-                {"matrix": [2, 17], "x": 17.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 18], "x": 19, "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, "h": 2},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 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},
-                {"matrix": [3, 13], "x": 13.25, "y": 3},
-                {"matrix": [3, 14], "x": 14.25, "y": 3},
-                {"matrix": [3, 15], "x": 15.25, "y": 3},
-                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 17], "x": 18, "y": 3},
-                {"matrix": [3, 18], "x": 19, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-                {"matrix": [4, 12], "x": 16, "y": 4},
-                {"matrix": [4, 16], "x": 17, "y": 4},
-                {"matrix": [4, 17], "x": 18, "y": 4},
-                {"matrix": [4, 18], "x": 19, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/switchplate/southpaw_65/keyboard.json b/keyboards/switchplate/southpaw_65/keyboard.json
new file mode 100644
index 00000000000..fd879349f25
--- /dev/null
+++ b/keyboards/switchplate/southpaw_65/keyboard.json
@@ -0,0 +1,334 @@
+{
+    "keyboard_name": "Southpaw Extended 65%",
+    "manufacturer": "Switchplate Peripherals",
+    "url": "https://geekhack.org/index.php?topic=92344.0",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x4084",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "backlight": {
+        "pin": "B5",
+        "levels": 10
+    },
+    "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": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0},
+                {"matrix": [4, 13], "x": 18, "y": 0},
+                {"matrix": [0, 18], "x": 19, "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, "w": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "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},
+                {"matrix": [1, 14], "x": 14.5, "y": 1},
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "x": 17.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 18], "x": 19, "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, "w": 1.75},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 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},
+                {"matrix": [2, 14], "x": 14.75, "y": 2},
+                {"matrix": [2, 15], "x": 15.75, "y": 2},
+                {"matrix": [2, 16], "x": 16.75, "y": 2},
+                {"matrix": [2, 17], "x": 17.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 18], "x": 19, "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},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 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},
+                {"matrix": [3, 13], "x": 13.25, "y": 3},
+                {"matrix": [3, 14], "x": 14.25, "y": 3},
+                {"matrix": [3, 15], "x": 15.25, "y": 3},
+                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 17], "x": 18, "y": 3},
+                {"matrix": [3, 18], "x": 19, "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": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 12], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 17], "x": 18, "y": 4},
+                {"matrix": [4, 18], "x": 19, "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": [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, "w": 2},
+                {"matrix": [0, 18], "x": 19, "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, "h": 2},
+                {"matrix": [1, 4], "x": 4, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "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},
+                {"matrix": [1, 14], "x": 14.5, "y": 1},
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "x": 17.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 18], "x": 19, "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, 4], "x": 4, "y": 2, "w": 1.75},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 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},
+                {"matrix": [2, 14], "x": 14.75, "y": 2},
+                {"matrix": [2, 15], "x": 15.75, "y": 2},
+                {"matrix": [2, 17], "x": 16.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 18], "x": 19, "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, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 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},
+                {"matrix": [3, 13], "x": 13.25, "y": 3},
+                {"matrix": [3, 14], "x": 14.25, "y": 3},
+                {"matrix": [3, 15], "x": 15.25, "y": 3},
+                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 17], "x": 18, "y": 3},
+                {"matrix": [3, 18], "x": 19, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 12], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 17], "x": 18, "y": 4},
+                {"matrix": [4, 18], "x": 19, "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": [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, "w": 2},
+                {"matrix": [0, 18], "x": 19, "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, "h": 2},
+                {"matrix": [1, 4], "x": 4, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "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},
+                {"matrix": [1, 14], "x": 14.5, "y": 1},
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "x": 16.5, "y": 1},
+                {"matrix": [1, 18], "x": 19, "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, 4], "x": 4, "y": 2, "w": 1.75},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 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},
+                {"matrix": [2, 14], "x": 14.75, "y": 2},
+                {"matrix": [2, 15], "x": 15.75, "y": 2},
+                {"matrix": [2, 16], "x": 16.75, "y": 2},
+                {"matrix": [2, 17], "x": 17.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 18], "x": 19, "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, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 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},
+                {"matrix": [3, 13], "x": 13.25, "y": 3},
+                {"matrix": [3, 14], "x": 14.25, "y": 3},
+                {"matrix": [3, 15], "x": 15.25, "y": 3},
+                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 17], "x": 18, "y": 3},
+                {"matrix": [3, 18], "x": 19, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 12], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 17], "x": 18, "y": 4},
+                {"matrix": [4, 18], "x": 19, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/switchplate/southpaw_65/rules.mk b/keyboards/switchplate/southpaw_65/rules.mk
index 89d05c5487e..e11c65db028 100644
--- a/keyboards/switchplate/southpaw_65/rules.mk
+++ b/keyboards/switchplate/southpaw_65/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/sx60/info.json b/keyboards/sx60/info.json
deleted file mode 100644
index 246d2892f45..00000000000
--- a/keyboards/sx60/info.json
+++ /dev/null
@@ -1,367 +0,0 @@
-{
-    "keyboard_name": "SX60",
-    "manufacturer": "Quantrik",
-    "url": "",
-    "maintainer": "https://github.com/amnobis",
-    "usb": {
-        "vid": "0x5154",
-        "pid": "0x0010",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B7"
-    },
-    "indicators": {
-        "caps_lock": "F4",
-        "num_lock": "F5",
-        "scroll_lock": "F1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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, 8], "x": 9.25, "y": 0},
-                {"matrix": [0, 9], "x": 10.25, "y": 0},
-                {"matrix": [0, 10], "x": 11.25, "y": 0},
-                {"matrix": [0, 11], "x": 12.25, "y": 0},
-                {"matrix": [0, 12], "x": 13.25, "y": 0},
-                {"matrix": [0, 13], "x": 14.25, "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},
-
-                {"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, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [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, 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": 16, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"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": [3, 7], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 8], "x": 9.5, "y": 3},
-                {"matrix": [3, 9], "x": 10.5, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3},
-                {"matrix": [3, 12], "x": 13.5, "y": 3},
-                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 16.25, "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, 4], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 7, "y": 4},
-
-                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 14.25, "y": 4},
-                {"matrix": [4, 12], "x": 15.25, "y": 4},
-                {"matrix": [4, 13], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_bs_rshift": {
-            "layout": [
-                {"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, 8], "x": 9.25, "y": 0},
-                {"matrix": [0, 9], "x": 10.25, "y": 0},
-                {"matrix": [0, 10], "x": 11.25, "y": 0},
-                {"matrix": [0, 11], "x": 12.25, "y": 0},
-                {"matrix": [0, 12], "x": 13.25, "y": 0},
-                {"matrix": [0, 13], "x": 14.25, "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},
-
-                {"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, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [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, 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, "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": 9.5, "y": 3},
-                {"matrix": [3, 9], "x": 10.5, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3},
-                {"matrix": [3, 12], "x": 13.5, "y": 3},
-                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 16.25, "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, 4], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 7, "y": 4},
-
-                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 14.25, "y": 4},
-                {"matrix": [4, 12], "x": 15.25, "y": 4},
-                {"matrix": [4, 13], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_bs": {
-            "layout": [
-                {"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, 8], "x": 9.25, "y": 0},
-                {"matrix": [0, 9], "x": 10.25, "y": 0},
-                {"matrix": [0, 10], "x": 11.25, "y": 0},
-                {"matrix": [0, 11], "x": 12.25, "y": 0},
-                {"matrix": [0, 12], "x": 13.25, "y": 0},
-                {"matrix": [0, 13], "x": 14.25, "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},
-
-                {"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, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [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, 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, "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": 9.5, "y": 3},
-                {"matrix": [3, 9], "x": 10.5, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3},
-                {"matrix": [3, 12], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-
-                {"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, 4], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 7, "y": 4},
-
-                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 14.25, "y": 4},
-                {"matrix": [4, 12], "x": 15.25, "y": 4},
-                {"matrix": [4, 13], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_rshift": {
-            "layout": [
-                {"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, 8], "x": 9.25, "y": 0},
-                {"matrix": [0, 9], "x": 10.25, "y": 0},
-                {"matrix": [0, 10], "x": 11.25, "y": 0},
-                {"matrix": [0, 11], "x": 12.25, "y": 0},
-                {"matrix": [0, 12], "x": 13.25, "y": 0},
-                {"matrix": [0, 13], "x": 14.25, "y": 0},
-                {"matrix": [0, 14], "x": 15.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, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [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, 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, "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": 9.5, "y": 3},
-                {"matrix": [3, 9], "x": 10.5, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3},
-                {"matrix": [3, 12], "x": 13.5, "y": 3},
-                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 16.25, "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, 4], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 7, "y": 4},
-
-                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 14.25, "y": 4},
-                {"matrix": [4, 12], "x": 15.25, "y": 4},
-                {"matrix": [4, 13], "x": 16.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/sx60/keyboard.json b/keyboards/sx60/keyboard.json
new file mode 100644
index 00000000000..42eefbc81a8
--- /dev/null
+++ b/keyboards/sx60/keyboard.json
@@ -0,0 +1,374 @@
+{
+    "keyboard_name": "SX60",
+    "manufacturer": "Quantrik",
+    "url": "",
+    "maintainer": "https://github.com/amnobis",
+    "usb": {
+        "vid": "0x5154",
+        "pid": "0x0010",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "backlight": {
+        "pin": "B7"
+    },
+    "indicators": {
+        "caps_lock": "F4",
+        "num_lock": "F5",
+        "scroll_lock": "F1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "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},
+
+                {"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, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [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, 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": 16, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"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": [3, 7], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 16.25, "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, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"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, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "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},
+
+                {"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, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [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, 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, "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": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "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, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"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, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "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},
+
+                {"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, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [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, 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, "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": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+                {"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, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_rshift": {
+            "layout": [
+                {"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, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.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, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [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, 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, "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": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "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, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sx60/rules.mk b/keyboards/sx60/rules.mk
index 2f0d22e49f8..394c3372d21 100755
--- a/keyboards/sx60/rules.mk
+++ b/keyboards/sx60/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 = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
 CUSTOM_MATRIX = yes
 
 # project specific files
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
deleted file mode 100644
index 536b310cc03..00000000000
--- a/keyboards/system76/launch_1/info.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-    "keyboard_name": "Launch Configurable Keyboard (launch_1)",
-    "manufacturer": "System76",
-    "url": "https://system76.com/accessories/launch",
-    "usb": {
-        "vid": "0x3384",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "rainbow_moving_chevron": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "raindrops": true,
-            "splash": true,
-            "multisplash": true
-        },
-        "default": {
-            "animation": "rainbow_moving_chevron",
-            "hue": 142,
-            "sat": 255,
-            "speed": 127
-        },
-        "driver": "ws2812",
-        "max_brightness": 176,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"],
-        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-   "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
-
-                {"matrix": [3, 13], "x": 14.75, "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": 1.5},
-
-                {"matrix": [4, 13], "x": 14.75, "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},
-
-                {"matrix": [5, 13], "x": 14.75, "y": 2},
-
-                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.5},
-                {"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": 1.5},
-
-                {"matrix": [5, 5], "x": 14.75, "y": 3},
-
-                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 2},
-                {"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.5},
-                {"matrix": [4, 12], "x": 13.75, "y": 4},
-
-                {"matrix": [5, 0], "x": 0.25, "y": 5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.75, "y": 5},
-                {"matrix": [5, 2], "x": 2.75, "y": 5},
-                {"matrix": [5, 3], "x": 3.75, "y": 5},
-                {"matrix": [5, 4], "x": 4.75, "y": 5, "w": 2},
-                {"matrix": [5, 6], "x": 6.75, "y": 5, "w": 2},
-                {"matrix": [5, 7], "x": 8.75, "y": 5},
-                {"matrix": [5, 8], "x": 9.75, "y": 5},
-                {"matrix": [5, 9], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"matrix": [5, 10], "x": 12.75, "y": 5},
-                {"matrix": [5, 11], "x": 13.75, "y": 5},
-                {"matrix": [5, 12], "x": 14.75, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/system76/launch_1/keyboard.json b/keyboards/system76/launch_1/keyboard.json
new file mode 100644
index 00000000000..28a505448ef
--- /dev/null
+++ b/keyboards/system76/launch_1/keyboard.json
@@ -0,0 +1,156 @@
+{
+    "keyboard_name": "Launch Configurable Keyboard (launch_1)",
+    "manufacturer": "System76",
+    "url": "https://system76.com/accessories/launch",
+    "usb": {
+        "vid": "0x3384",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "dynamic_keymap": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "raw": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "raindrops": true,
+            "splash": true,
+            "multisplash": true
+        },
+        "default": {
+            "animation": "rainbow_moving_chevron",
+            "hue": 142,
+            "sat": 255,
+            "speed": 127
+        },
+        "driver": "ws2812",
+        "max_brightness": 176,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+   "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 14.75, "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": 1.5},
+
+                {"matrix": [4, 13], "x": 14.75, "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},
+
+                {"matrix": [5, 13], "x": 14.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.5},
+                {"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": 1.5},
+
+                {"matrix": [5, 5], "x": 14.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 2},
+                {"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.5},
+                {"matrix": [4, 12], "x": 13.75, "y": 4},
+
+                {"matrix": [5, 0], "x": 0.25, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.75, "y": 5},
+                {"matrix": [5, 2], "x": 2.75, "y": 5},
+                {"matrix": [5, 3], "x": 3.75, "y": 5},
+                {"matrix": [5, 4], "x": 4.75, "y": 5, "w": 2},
+                {"matrix": [5, 6], "x": 6.75, "y": 5, "w": 2},
+                {"matrix": [5, 7], "x": 8.75, "y": 5},
+                {"matrix": [5, 8], "x": 9.75, "y": 5},
+                {"matrix": [5, 9], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"matrix": [5, 10], "x": 12.75, "y": 5},
+                {"matrix": [5, 11], "x": 13.75, "y": 5},
+                {"matrix": [5, 12], "x": 14.75, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/system76/launch_1/rules.mk b/keyboards/system76/launch_1/rules.mk
index 181976b2ddc..6c4999df373 100644
--- a/keyboards/system76/launch_1/rules.mk
+++ b/keyboards/system76/launch_1/rules.mk
@@ -4,22 +4,7 @@ F_CPU = 8000000
 # External oscillator is 16 MHz
 F_USB = 16000000
 
-# Build options
-#   change yes to no to disable
-BOOTMAGIC_ENABLE = no       # 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
-DYNAMIC_KEYMAP_ENABLE = yes # Reconfigurable keyboard without flashing firmware
-NKRO_ENABLE = yes           # USB N-key rollover
-RAW_ENABLE = yes            # Raw HID commands (used by Keyboard Configurator)
-BACKLIGHT_ENABLE = no       # RGB backlight (conflicts with RGB matrix)
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes     # RGB matrix
 RGB_MATRIX_CUSTOM_KB = yes  # Custom keyboard effects
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes            # Link-time optimization for smaller binary
 
 # Add System76 EC command interface as well as I2C and USB mux drivers
 SRC += system76_ec.c usb_mux.c
diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h
deleted file mode 100755
index b9449c4714b..00000000000
--- a/keyboards/tada68/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/tada68/info.json b/keyboards/tada68/info.json
deleted file mode 100644
index 1311017d361..00000000000
--- a/keyboards/tada68/info.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-    "keyboard_name": "TADA68",
-    "manufacturer": "TADA",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x5441",
-        "pid": "0x0001",
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
-        "rows": ["D0", "D1", "F6", "F7", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 4,
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "B2",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "lufa-ms",
-    "community_layouts": ["65_ansi", "65_iso"],
-    "layout_aliases": {
-        "LAYOUT_ansi": "LAYOUT_65_ansi",
-        "LAYOUT_iso": "LAYOUT_65_iso"
-    },
-    "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, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 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, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_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, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [1, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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}
-            ]
-        },
-        "LAYOUT_ansi_split_enter": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 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},
-                {"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": 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, 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/tada68/keyboard.json b/keyboards/tada68/keyboard.json
new file mode 100644
index 00000000000..641def01a31
--- /dev/null
+++ b/keyboards/tada68/keyboard.json
@@ -0,0 +1,278 @@
+{
+    "keyboard_name": "TADA68",
+    "manufacturer": "TADA",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5441",
+        "pid": "0x0001",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": 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", "F6", "F7", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 4,
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "lufa-ms",
+    "community_layouts": ["65_ansi", "65_iso"],
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_65_ansi",
+        "LAYOUT_iso": "LAYOUT_65_iso"
+    },
+    "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, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 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, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_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, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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}
+            ]
+        },
+        "LAYOUT_ansi_split_enter": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
+                {"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": 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, 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/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h
index 21ddfa1850e..363a41accd6 100755
--- a/keyboards/tada68/keymaps/rgb/config.h
+++ b/keyboards/tada68/keymaps/rgb/config.h
@@ -1,4 +1,4 @@
-#include "../../config.h"
+#pragma once
 
 /* WS2812B RGB Underglow LED */
 #define WS2812_DI_PIN F5   // See readme.md for wiring your led's
diff --git a/keyboards/tada68/keymaps/rgb/rules.mk b/keyboards/tada68/keymaps/rgb/rules.mk
index 7cffca44fad..c777cb1b9ff 100644
--- a/keyboards/tada68/keymaps/rgb/rules.mk
+++ b/keyboards/tada68/keymaps/rgb/rules.mk
@@ -1,18 +1 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk
index 01310bd4ea0..e22d5248895 100755
--- a/keyboards/tada68/rules.mk
+++ b/keyboards/tada68/rules.mk
@@ -1,15 +1,2 @@
 # This board uses the older unsafe 6k version of lufa-ms
 BOOTLOADER_SIZE = 6144
-
-# 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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h
deleted file mode 100644
index 7b4e38bd964..00000000000
--- a/keyboards/takashicompany/compacx/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 takashicompany
-
-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/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json
deleted file mode 100644
index 08dcbfee54b..00000000000
--- a/keyboards/takashicompany/compacx/info.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "keyboard_name": "Compacx",
-    "manufacturer": "takashicompany",
-    "url": "https://github.com/takashicompany/compacx",
-    "maintainer": "takashicompany",
-    "usb": {
-        "vid": "0x7463",
-        "pid": "0x0014",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 12,
-        "sleep": true,
-        "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"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D1", "D0", "D4", "C6", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "E6", "pin_b": "B4"},
-            {"pin_a": "B6", "pin_b": "B5"}
-        ]
-    },
-    "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": [0, 6], "x": 6, "y": 0},
-                {"matrix": [1, 6], "x": 7, "y": 0},
-
-                {"matrix": [5, 0], "x": 9, "y": 0},
-                {"matrix": [5, 1], "x": 10, "y": 0},
-                {"matrix": [5, 2], "x": 11, "y": 0},
-                {"matrix": [5, 3], "x": 12, "y": 0},
-                {"matrix": [5, 4], "x": 13, "y": 0},
-                {"matrix": [5, 5], "x": 14, "y": 0},
-                {"matrix": [5, 6], "x": 15, "y": 0},
-                {"matrix": [6, 6], "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": [2, 6], "x": 6.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [6, 0], "x": 9, "y": 1, "w": 1.5},
-                {"matrix": [6, 1], "x": 10.5, "y": 1},
-                {"matrix": [6, 2], "x": 11.5, "y": 1},
-                {"matrix": [6, 3], "x": 12.5, "y": 1},
-                {"matrix": [6, 4], "x": 13.5, "y": 1},
-                {"matrix": [6, 5], "x": 14.5, "y": 1},
-                {"matrix": [7, 6], "x": 15.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": [7, 0], "x": 9, "y": 2, "w": 1.75},
-                {"matrix": [7, 1], "x": 10.75, "y": 2},
-                {"matrix": [7, 2], "x": 11.75, "y": 2},
-                {"matrix": [7, 3], "x": 12.75, "y": 2},
-                {"matrix": [7, 4], "x": 13.75, "y": 2},
-                {"matrix": [7, 5], "x": 14.75, "y": 2},
-
-                {"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": [8, 0], "x": 9, "y": 3, "w": 2},
-                {"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": [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},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 7, "y": 4},
-
-                {"matrix": [9, 0], "x": 9, "y": 4},
-                {"matrix": [9, 1], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 12.5, "y": 4},
-                {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 14.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 6], "x": 16, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/takashicompany/compacx/keyboard.json b/keyboards/takashicompany/compacx/keyboard.json
new file mode 100644
index 00000000000..b4460cce770
--- /dev/null
+++ b/keyboards/takashicompany/compacx/keyboard.json
@@ -0,0 +1,152 @@
+{
+    "keyboard_name": "Compacx",
+    "manufacturer": "takashicompany",
+    "url": "https://github.com/takashicompany/compacx",
+    "maintainer": "takashicompany",
+    "usb": {
+        "vid": "0x7463",
+        "pid": "0x0014",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "sleep": true,
+        "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"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D1", "D0", "D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "E6", "pin_b": "B4"},
+            {"pin_a": "B6", "pin_b": "B5"}
+        ]
+    },
+    "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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [1, 6], "x": 7, "y": 0},
+
+                {"matrix": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0},
+                {"matrix": [6, 6], "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": [2, 6], "x": 6.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 9, "y": 1, "w": 1.5},
+                {"matrix": [6, 1], "x": 10.5, "y": 1},
+                {"matrix": [6, 2], "x": 11.5, "y": 1},
+                {"matrix": [6, 3], "x": 12.5, "y": 1},
+                {"matrix": [6, 4], "x": 13.5, "y": 1},
+                {"matrix": [6, 5], "x": 14.5, "y": 1},
+                {"matrix": [7, 6], "x": 15.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": [7, 0], "x": 9, "y": 2, "w": 1.75},
+                {"matrix": [7, 1], "x": 10.75, "y": 2},
+                {"matrix": [7, 2], "x": 11.75, "y": 2},
+                {"matrix": [7, 3], "x": 12.75, "y": 2},
+                {"matrix": [7, 4], "x": 13.75, "y": 2},
+                {"matrix": [7, 5], "x": 14.75, "y": 2},
+
+                {"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": [8, 0], "x": 9, "y": 3, "w": 2},
+                {"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": [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},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+
+                {"matrix": [9, 0], "x": 9, "y": 4},
+                {"matrix": [9, 1], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 12.5, "y": 4},
+                {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 14.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 16, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/takashicompany/compacx/rules.mk b/keyboards/takashicompany/compacx/rules.mk
deleted file mode 100644
index 25fcdc1a34c..00000000000
--- a/keyboards/takashicompany/compacx/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
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/info.json
deleted file mode 100644
index da5a95b8957..00000000000
--- a/keyboards/takashicompany/spreadwriter/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "manufacturer": "takashicompany",
-    "keyboard_name": "Spreadwriter",
-    "maintainer": "takashicompany",
-    "bootloader": "caterina",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"],
-        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://github.com/takashicompany/spreadwriter",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0023",
-        "vid": "0x7463"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D1", "pin_b": "D0"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 53,
-        "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
-        "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": {
-            "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},
-                {"matrix": [0, 5], "x": 5, "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.25},
-                {"matrix": [4, 5], "x": 14, "y": 0.5},
-                {"matrix": [4, 6], "x": 15, "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},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 7.5, "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.25},
-                {"matrix": [5, 5], "x": 14, "y": 1.5},
-                {"matrix": [5, 6], "x": 15, "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},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "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.25},
-                {"matrix": [6, 5], "x": 14, "y": 2.5},
-                {"matrix": [6, 6], "x": 15, "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.25},
-                {"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": [5, 0], "x": 7.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.25},
-                {"matrix": [7, 5], "x": 14, "y": 3.5},
-                {"matrix": [7, 6], "x": 15, "y": 3.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/takashicompany/spreadwriter/keyboard.json b/keyboards/takashicompany/spreadwriter/keyboard.json
new file mode 100644
index 00000000000..2c9fcd1619a
--- /dev/null
+++ b/keyboards/takashicompany/spreadwriter/keyboard.json
@@ -0,0 +1,112 @@
+{
+    "manufacturer": "takashicompany",
+    "keyboard_name": "Spreadwriter",
+    "maintainer": "takashicompany",
+    "bootloader": "caterina",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://github.com/takashicompany/spreadwriter",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0023",
+        "vid": "0x7463"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 53,
+        "hue_steps": 10,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+        "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": {
+            "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},
+                {"matrix": [0, 5], "x": 5, "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.25},
+                {"matrix": [4, 5], "x": 14, "y": 0.5},
+                {"matrix": [4, 6], "x": 15, "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},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 7.5, "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.25},
+                {"matrix": [5, 5], "x": 14, "y": 1.5},
+                {"matrix": [5, 6], "x": 15, "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},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "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.25},
+                {"matrix": [6, 5], "x": 14, "y": 2.5},
+                {"matrix": [6, 6], "x": 15, "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.25},
+                {"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": [5, 0], "x": 7.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.25},
+                {"matrix": [7, 5], "x": 14, "y": 3.5},
+                {"matrix": [7, 6], "x": 15, "y": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/takashicompany/spreadwriter/rules.mk b/keyboards/takashicompany/spreadwriter/rules.mk
deleted file mode 100644
index 248f19320f0..00000000000
--- a/keyboards/takashicompany/spreadwriter/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ENCODER_ENABLE = yes
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
deleted file mode 100644
index 1c14611b2b9..00000000000
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2018 takashiski
-
-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 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
-
-/*
-#define USE_I2C
-#define MASTER_LEFT
-#define EEHANDS
-*/
diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json
deleted file mode 100644
index 767f787e5e3..00000000000
--- a/keyboards/takashiski/hecomi/alpha/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "keyboard_name": "hecomi_alpha",
-  "manufacturer": "takashiski",
-  "url": "https://skyhigh-works.hatenablog.com/entry/2019/02/25/221959",
-  "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": {
-    "enabled": true,
-    "soft_serial_pin": "D1"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 16,
-    "split_count": [8, 8]
-  },
-  "ws2812": {
-    "pin": "D4"
-  },
-  "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": 8.25, "y": 0},
-        {"matrix": [5, 1], "x": 9.25, "y": 0},
-        {"matrix": [5, 2], "x": 10.25, "y": 0},
-        {"matrix": [5, 3], "x": 11.25, "y": 0},
-        {"matrix": [5, 4], "x": 12.25, "y": 0},
-        {"matrix": [5, 5], "x": 13.25, "y": 0},
-        {"matrix": [5, 6], "x": 14.25, "y": 0},
-        {"matrix": [5, 7], "x": 15.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": [6, 0], "x": 7.75, "y": 1},
-        {"matrix": [6, 1], "x": 8.75, "y": 1},
-        {"matrix": [6, 2], "x": 9.75, "y": 1},
-        {"matrix": [6, 3], "x": 10.75, "y": 1},
-        {"matrix": [6, 4], "x": 11.75, "y": 1},
-        {"matrix": [6, 5], "x": 12.75, "y": 1},
-        {"matrix": [6, 6], "x": 13.75, "y": 1},
-        {"matrix": [6, 7], "x": 14.75, "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, 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": [7, 6], "x": 13, "y": 2},
-        {"matrix": [7, 7], "x": 14, "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": [8, 0], "x": 7.5, "y": 3},
-        {"matrix": [8, 1], "x": 8.5, "y": 3},
-        {"matrix": [8, 2], "x": 9.5, "y": 3},
-        {"matrix": [8, 3], "x": 10.5, "y": 3},
-        {"matrix": [8, 4], "x": 11.5, "y": 3},
-        {"matrix": [8, 5], "x": 12.5, "y": 3},
-        {"matrix": [8, 6], "x": 13.5, "y": 3, "w": 1.75},
-        {"matrix": [8, 7], "x": 15.25, "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},
-        {"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": [9, 2], "x": 7.75, "y": 4},
-        {"matrix": [9, 3], "x": 8.75, "y": 4},
-        {"matrix": [9, 4], "x": 9.75, "y": 4},
-        {"matrix": [9, 5], "x": 10.75, "y": 4},
-        {"matrix": [9, 6], "x": 11.75, "y": 4},
-        {"matrix": [9, 7], "x": 12.75, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/takashiski/hecomi/alpha/keyboard.json b/keyboards/takashiski/hecomi/alpha/keyboard.json
new file mode 100644
index 00000000000..0a6bf513f0c
--- /dev/null
+++ b/keyboards/takashiski/hecomi/alpha/keyboard.json
@@ -0,0 +1,130 @@
+{
+  "keyboard_name": "hecomi_alpha",
+  "manufacturer": "takashiski",
+  "url": "https://skyhigh-works.hatenablog.com/entry/2019/02/25/221959",
+  "maintainer": "takashiski",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "command": true,
+    "console": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": false,
+    "rgblight": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "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": "D1"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "split_count": [8, 8]
+  },
+  "ws2812": {
+    "pin": "D4"
+  },
+  "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": 8.25, "y": 0},
+        {"matrix": [5, 1], "x": 9.25, "y": 0},
+        {"matrix": [5, 2], "x": 10.25, "y": 0},
+        {"matrix": [5, 3], "x": 11.25, "y": 0},
+        {"matrix": [5, 4], "x": 12.25, "y": 0},
+        {"matrix": [5, 5], "x": 13.25, "y": 0},
+        {"matrix": [5, 6], "x": 14.25, "y": 0},
+        {"matrix": [5, 7], "x": 15.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": [6, 0], "x": 7.75, "y": 1},
+        {"matrix": [6, 1], "x": 8.75, "y": 1},
+        {"matrix": [6, 2], "x": 9.75, "y": 1},
+        {"matrix": [6, 3], "x": 10.75, "y": 1},
+        {"matrix": [6, 4], "x": 11.75, "y": 1},
+        {"matrix": [6, 5], "x": 12.75, "y": 1},
+        {"matrix": [6, 6], "x": 13.75, "y": 1},
+        {"matrix": [6, 7], "x": 14.75, "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, 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": [7, 6], "x": 13, "y": 2},
+        {"matrix": [7, 7], "x": 14, "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": [8, 0], "x": 7.5, "y": 3},
+        {"matrix": [8, 1], "x": 8.5, "y": 3},
+        {"matrix": [8, 2], "x": 9.5, "y": 3},
+        {"matrix": [8, 3], "x": 10.5, "y": 3},
+        {"matrix": [8, 4], "x": 11.5, "y": 3},
+        {"matrix": [8, 5], "x": 12.5, "y": 3},
+        {"matrix": [8, 6], "x": 13.5, "y": 3, "w": 1.75},
+        {"matrix": [8, 7], "x": 15.25, "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},
+        {"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": [9, 2], "x": 7.75, "y": 4},
+        {"matrix": [9, 3], "x": 8.75, "y": 4},
+        {"matrix": [9, 4], "x": 9.75, "y": 4},
+        {"matrix": [9, 5], "x": 10.75, "y": 4},
+        {"matrix": [9, 6], "x": 11.75, "y": 4},
+        {"matrix": [9, 7], "x": 12.75, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/takashiski/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk
deleted file mode 100644
index 98c2f6b6a7f..00000000000
--- a/keyboards/takashiski/hecomi/alpha/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 = 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
diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json
deleted file mode 100644
index c65a429f69d..00000000000
--- a/keyboards/takashiski/otaku_split/rev0/info.json
+++ /dev/null
@@ -1,108 +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": {
-        "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/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 fce764c22d4..00000000000
--- a/keyboards/takashiski/otaku_split/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 = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json
deleted file mode 100644
index 251e2c36b90..00000000000
--- a/keyboards/takashiski/otaku_split/rev1/info.json
+++ /dev/null
@@ -1,116 +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": {
-        "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/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 fce764c22d4..00000000000
--- a/keyboards/takashiski/otaku_split/rev1/rules.mk
+++ /dev/null
@@ -1,12 +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
diff --git a/keyboards/telophase/info.json b/keyboards/telophase/info.json
deleted file mode 100644
index 2dd6c5dc783..00000000000
--- a/keyboards/telophase/info.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-    "keyboard_name": "Telophase",
-    "manufacturer": "Unknown",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["ortho_4x12"],
-    "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": 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": [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": 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": [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": 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": [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": 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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/telophase/keyboard.json b/keyboards/telophase/keyboard.json
new file mode 100644
index 00000000000..8efbae55195
--- /dev/null
+++ b/keyboards/telophase/keyboard.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "Telophase",
+    "manufacturer": "Unknown",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["ortho_4x12"],
+    "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": 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": [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": 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": [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": 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": [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": 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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/telophase/rules.mk b/keyboards/telophase/rules.mk
index 706d6106538..ae63f87e079 100644
--- a/keyboards/telophase/rules.mk
+++ b/keyboards/telophase/rules.mk
@@ -1,18 +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 = 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 = lite
-
-# project specific files
 SRC += matrix.c
 UART_DRIVER_REQUIRED = yes
 
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
deleted file mode 100644
index 4f908c83e62..00000000000
--- a/keyboards/tkc/portico/info.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "keyboard_name": "Portico",
-    "manufacturer": "TKC",
-    "url": "",
-    "maintainer": "TerryMathews",
-    "usb": {
-        "vid": "0x544B",
-        "pid": "0x0008",
-        "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
-        },
-        "driver": "is31fl3731",
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "max_brightness": 200,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
-        "rows": ["B6", "C6", "C7", "F7", "D2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker"
-    },
-    "community_layouts": ["65_ansi_blocker"],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tkc/portico/keyboard.json b/keyboards/tkc/portico/keyboard.json
new file mode 100644
index 00000000000..29b7d8246b2
--- /dev/null
+++ b/keyboards/tkc/portico/keyboard.json
@@ -0,0 +1,142 @@
+{
+    "keyboard_name": "Portico",
+    "manufacturer": "TKC",
+    "url": "",
+    "maintainer": "TerryMathews",
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0008",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": 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
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
+        "rows": ["B6", "C6", "C7", "F7", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 3,
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker"
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk
index 6bc05372aff..4263ceb1684 100644
--- a/keyboards/tkc/portico/rules.mk
+++ b/keyboards/tkc/portico/rules.mk
@@ -1,22 +1,8 @@
-# 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
-RGB_MATRIX_ENABLE = no
 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/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
deleted file mode 100644
index fa2a24951fa..00000000000
--- a/keyboards/tkc/portico75/info.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "keyboard_name": "Portico75",
-    "manufacturer": "TKC",
-    "url": "",
-    "maintainer": "TerryMathews",
-    "usb": {
-        "vid": "0x544B",
-        "pid": "0x0011",
-        "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
-        },
-        "driver": "is31fl3741",
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "max_brightness": 200,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
-        "rows": ["B0", "E6", "F0", "F1", "D3", "D2"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B1", "pin_b": "B2", "resolution": 2}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layouts": {
-        "LAYOUT_75_ansi": {
-            "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, "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, "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, "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, 12], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 12], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tkc/portico75/keyboard.json b/keyboards/tkc/portico75/keyboard.json
new file mode 100644
index 00000000000..79ead697648
--- /dev/null
+++ b/keyboards/tkc/portico75/keyboard.json
@@ -0,0 +1,159 @@
+{
+    "keyboard_name": "Portico75",
+    "manufacturer": "TKC",
+    "url": "",
+    "maintainer": "TerryMathews",
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0011",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "encoder": 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
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
+        "rows": ["B0", "E6", "F0", "F1", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B1", "pin_b": "B2", "resolution": 2}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "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, "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, "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, "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, 12], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 12], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tkc/portico75/keymaps/via/rules.mk b/keyboards/tkc/portico75/keymaps/via/rules.mk
index 1706771222e..81628aba6ba 100644
--- a/keyboards/tkc/portico75/keymaps/via/rules.mk
+++ b/keyboards/tkc/portico75/keymaps/via/rules.mk
@@ -10,3 +10,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
        drivers/led/issi/is31fl3741.c
 
 I2C_DRIVER_REQUIRED = yes
+CIE1931_CURVE = yes
diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk
deleted file mode 100644
index 36e22b992da..00000000000
--- a/keyboards/tkc/portico75/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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-CIE1931_CURVE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index 7700780b2e8..507f4c47926 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -4,7 +4,19 @@
     "maintainer": "vattern",
     "usb": {
         "vid": "0xFEED",
-        "pid": "0x7812"
+        "pid": "0x7812",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
     },
     "ws2812": {
         "pin": "B1",
diff --git a/keyboards/tkw/grandiceps/rev2/info.json b/keyboards/tkw/grandiceps/rev2/keyboard.json
similarity index 100%
rename from keyboards/tkw/grandiceps/rev2/info.json
rename to keyboards/tkw/grandiceps/rev2/keyboard.json
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
index 5b78d6fe55c..01fa5217635 100644
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@@ -1,20 +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 = yes       # Enable keyboard RGB underglow
-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
-
 SERIAL_DRIVER = usart
-OLED_ENABLE = yes
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
 
 DEFAULT_FOLDER = tkw/grandiceps/rev1
diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json
deleted file mode 100644
index 9d7a60a4b97..00000000000
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-    "keyboard_name": "stoutgat",
-    "manufacturer": "TKW",
-    "url": "https://github.com/vattern/stoutgat",
-    "maintainer": "vattern",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x7811",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
-        "rows": ["D1", "D0", "A0", "A1", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "B3"},
-            {"pin_a": "B0", "pin_b": "B1"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "community_layouts": ["65_iso", "65_ansi"],
-    "layouts": {
-        "LAYOUT_65_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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"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": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"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": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
-                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso": {
-            "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"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": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2},
-                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"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": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
-                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_encoder": {
-            "layout": [
-                {"label": "K44", "matrix": [4, 4], "x": 1, "y": 0},
-
-                {"label": "K48", "matrix": [4, 8], "x": 14, "y": 0},
-
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 1, "w": 2},
-                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 1},
-
-                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 2},
-
-                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 3},
-                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 3},
-
-                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 4},
-                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 4},
-
-                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
-                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 5},
-                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 5},
-                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 5},
-                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tkw/stoutgat/v1/keyboard.json b/keyboards/tkw/stoutgat/v1/keyboard.json
new file mode 100644
index 00000000000..2dd46af4947
--- /dev/null
+++ b/keyboards/tkw/stoutgat/v1/keyboard.json
@@ -0,0 +1,271 @@
+{
+    "keyboard_name": "stoutgat",
+    "manufacturer": "TKW",
+    "url": "https://github.com/vattern/stoutgat",
+    "maintainer": "vattern",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x7811",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
+        "rows": ["D1", "D0", "A0", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B3"},
+            {"pin_a": "B0", "pin_b": "B1"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "community_layouts": ["65_iso", "65_ansi"],
+    "layouts": {
+        "LAYOUT_65_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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"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": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"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": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"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": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"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": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_encoder": {
+            "layout": [
+                {"label": "K44", "matrix": [4, 4], "x": 1, "y": 0},
+
+                {"label": "K48", "matrix": [4, 8], "x": 14, "y": 0},
+
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 1, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 1},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 2},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 3},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 3},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 4},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 4},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 5},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 5},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 5},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk
index 8dca0665f77..c2ee0bc86f9 100644
--- a/keyboards/tkw/stoutgat/v1/rules.mk
+++ b/keyboards/tkw/stoutgat/v1/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/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index b1232f6816e..dbb227b0fdc 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7811",
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "ws2812": {
         "pin": "B1",
         "driver": "pwm"
diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk
index 477d680add8..1a660af26c9 100644
--- a/keyboards/tkw/stoutgat/v2/rules.mk
+++ b/keyboards/tkw/stoutgat/v2/rules.mk
@@ -1,18 +1 @@
-# 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
-
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
-
 DEFAULT_FOLDER = tkw/stoutgat/v2/f411
diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json
deleted file mode 100644
index 7b2f198e596..00000000000
--- a/keyboards/tokyokeyboard/alix40/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "keyboard_name": "alix40",
-    "manufacturer": "quadcube",
-    "url": "https://tokyokeyboard.com/",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x5143",
-        "pid": "0x4134",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"],
-        "rows": ["D7", "C6", "C7", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "backlight": {
-        "pin": "B7",
-        "levels": 31,
-        "breathing": true
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "saturation_steps": 10,
-        "brightness_steps": 10,
-        "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": "B0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_40_alix": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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": 10.5, "y": 0},
-                {"matrix": [0, 10], "x": 11.5, "y": 0},
-                {"matrix": [0, 11], "x": 12.5, "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": 7.75, "y": 1},
-                {"matrix": [1, 7], "x": 8.75, "y": 1},
-                {"matrix": [1, 8], "x": 9.75, "y": 1},
-                {"matrix": [1, 9], "x": 10.75, "y": 1},
-                {"matrix": [1, 10], "x": 11.75, "y": 1},
-                {"matrix": [1, 11], "x": 12.75, "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": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [2, 7], "x": 8.25, "y": 2},
-                {"matrix": [2, 8], "x": 9.25, "y": 2},
-                {"matrix": [2, 9], "x": 10.25, "y": 2},
-                {"matrix": [2, 10], "x": 11.25, "y": 2},
-                {"matrix": [2, 11], "x": 12.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0.5, "y": 3},
-                {"matrix": [3, 1], "x": 1.5, "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": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tokyokeyboard/alix40/keyboard.json b/keyboards/tokyokeyboard/alix40/keyboard.json
new file mode 100644
index 00000000000..e4c27aaec21
--- /dev/null
+++ b/keyboards/tokyokeyboard/alix40/keyboard.json
@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "alix40",
+    "manufacturer": "quadcube",
+    "url": "https://tokyokeyboard.com/",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5143",
+        "pid": "0x4134",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"],
+        "rows": ["D7", "C6", "C7", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "backlight": {
+        "pin": "B7",
+        "levels": 31,
+        "breathing": true
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "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": "B0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_40_alix": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "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": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 11], "x": 12.75, "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": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3},
+                {"matrix": [3, 1], "x": 1.5, "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": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tokyokeyboard/alix40/rules.mk b/keyboards/tokyokeyboard/alix40/rules.mk
index 5d6d78ae10a..3437a35bdf1 100644
--- a/keyboards/tokyokeyboard/alix40/rules.mk
+++ b/keyboards/tokyokeyboard/alix40/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 = 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
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/info.json b/keyboards/tominabox1/littlefoot_lx/rev1/info.json
deleted file mode 100644
index be22362de21..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev1/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "Littlefoot LX",
-    "manufacturer": "tominabox1",
-    "url": "",
-    "maintainer": "tominabox1",
-    "usb": {
-        "vid": "0x7431",
-        "pid": "0x6C78",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"],
-        "rows": ["D5", "F4", "D3", "F1", "F0"]
-    },
-    "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": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-
-                {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
-            ]
-        },
-        "LAYOUT_split": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-
-                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json
new file mode 100644
index 00000000000..b021ba9c8d4
--- /dev/null
+++ b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Littlefoot LX",
+    "manufacturer": "tominabox1",
+    "url": "",
+    "maintainer": "tominabox1",
+    "usb": {
+        "vid": "0x7431",
+        "pid": "0x6C78",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"],
+        "rows": ["D5", "F4", "D3", "F1", "F0"]
+    },
+    "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+
+                {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
+            ]
+        },
+        "LAYOUT_split": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk
deleted file mode 100644
index 964fd155399..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/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 = 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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/info.json b/keyboards/tominabox1/littlefoot_lx/rev2/info.json
deleted file mode 100644
index 6a48b5076b4..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev2/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "Littlefoot LX",
-    "manufacturer": "tominabox1",
-    "url": "",
-    "maintainer": "tominabox1",
-    "usb": {
-        "vid": "0x7431",
-        "pid": "0x6C78",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"],
-        "rows": ["D5", "F4", "D3", "F1", "F0"]
-    },
-    "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": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-
-                {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
-            ]
-        },
-        "LAYOUT_split": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-
-                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json
new file mode 100644
index 00000000000..fe1cf6e5960
--- /dev/null
+++ b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Littlefoot LX",
+    "manufacturer": "tominabox1",
+    "url": "",
+    "maintainer": "tominabox1",
+    "usb": {
+        "vid": "0x7431",
+        "pid": "0x6C78",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"],
+        "rows": ["D5", "F4", "D3", "F1", "F0"]
+    },
+    "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+
+                {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
+            ]
+        },
+        "LAYOUT_split": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk
deleted file mode 100644
index 964fd155399..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev2/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 = 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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/tominabox1/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h
deleted file mode 100644
index 333d0a100eb..00000000000
--- a/keyboards/tominabox1/underscore33/rev1/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * 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/tominabox1/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/info.json
deleted file mode 100644
index c52c1b13730..00000000000
--- a/keyboards/tominabox1/underscore33/rev1/info.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "keyboard_name": "underscore33",
-  "manufacturer": "tominabox1",
-  "url": "",
-  "maintainer": "tominabox1",
-  "usb": {
-    "vid": "0x7431",
-    "pid": "0x3301",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"],
-    "rows": ["F5", "F6", "C6", "D0"]
-  },
-  "diode_direction": "ROW2COL",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_33_big_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": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-
-        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
-        {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
-        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
-      ]
-    },
-    "LAYOUT_33_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": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-
-        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
-        {"matrix": [3, 2], "x": 1.9, "y": 3, "w": 2.25},
-        {"matrix": [3, 4], "x": 4.15, "y": 3, "w": 1.75},
-        {"matrix": [3, 6], "x": 5.9, "y": 3, "w": 2.25},
-        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/tominabox1/underscore33/rev1/keyboard.json b/keyboards/tominabox1/underscore33/rev1/keyboard.json
new file mode 100644
index 00000000000..221ecccb041
--- /dev/null
+++ b/keyboards/tominabox1/underscore33/rev1/keyboard.json
@@ -0,0 +1,114 @@
+{
+  "keyboard_name": "underscore33",
+  "manufacturer": "tominabox1",
+  "url": "",
+  "maintainer": "tominabox1",
+  "usb": {
+    "vid": "0x7431",
+    "pid": "0x3301",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "matrix_pins": {
+    "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"],
+    "rows": ["F5", "F6", "C6", "D0"]
+  },
+  "diode_direction": "ROW2COL",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT_33_big_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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
+        {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+      ]
+    },
+    "LAYOUT_33_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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 1.9, "y": 3, "w": 2.25},
+        {"matrix": [3, 4], "x": 4.15, "y": 3, "w": 1.75},
+        {"matrix": [3, 6], "x": 5.9, "y": 3, "w": 2.25},
+        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/tominabox1/underscore33/rev1/rules.mk b/keyboards/tominabox1/underscore33/rev1/rules.mk
deleted file mode 100644
index 3b6a1809db1..00000000000
--- a/keyboards/tominabox1/underscore33/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 = 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/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h
deleted file mode 100644
index 333d0a100eb..00000000000
--- a/keyboards/tominabox1/underscore33/rev2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * 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/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json
deleted file mode 100644
index b9c8b87b502..00000000000
--- a/keyboards/tominabox1/underscore33/rev2/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "keyboard_name": "underscore33",
-  "manufacturer": "tominabox1",
-  "url": "",
-  "maintainer": "tominabox1",
-  "usb": {
-    "vid": "0x7431",
-    "pid": "0x3302",
-    "device_version": "0.0.2"
-  },
-  "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": "D6"
-  },
-  "matrix_pins": {
-    "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "C2", "D0"],
-    "rows": ["C4", "B0", "B1", "B2"]
-  },
-  "diode_direction": "ROW2COL",
-  "processor": "atmega32u2",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_33_big_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": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-
-        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
-        {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
-        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
-      ]
-    },
-    "LAYOUT_33_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": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-
-        {"matrix": [3, 1], "x": 0.65, "y": 3},
-        {"matrix": [3, 2], "x": 1.65, "y": 3, "w": 1.25},
-        {"matrix": [3, 3], "x": 2.9, "y": 3, "w": 2.25},
-        {"matrix": [3, 5], "x": 5.15, "y": 3, "w": 2},
-        {"matrix": [3, 7], "x": 7.15, "y": 3, "w": 1.25},
-        {"matrix": [3, 8], "x": 8.4, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/tominabox1/underscore33/rev2/keyboard.json b/keyboards/tominabox1/underscore33/rev2/keyboard.json
new file mode 100644
index 00000000000..4375116963f
--- /dev/null
+++ b/keyboards/tominabox1/underscore33/rev2/keyboard.json
@@ -0,0 +1,133 @@
+{
+  "keyboard_name": "underscore33",
+  "manufacturer": "tominabox1",
+  "url": "",
+  "maintainer": "tominabox1",
+  "usb": {
+    "vid": "0x7431",
+    "pid": "0x3302",
+    "device_version": "0.0.2"
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "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": "D6"
+  },
+  "matrix_pins": {
+    "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "C2", "D0"],
+    "rows": ["C4", "B0", "B1", "B2"]
+  },
+  "diode_direction": "ROW2COL",
+  "processor": "atmega32u2",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT_33_big_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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
+        {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+      ]
+    },
+    "LAYOUT_33_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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 1], "x": 0.65, "y": 3},
+        {"matrix": [3, 2], "x": 1.65, "y": 3, "w": 1.25},
+        {"matrix": [3, 3], "x": 2.9, "y": 3, "w": 2.25},
+        {"matrix": [3, 5], "x": 5.15, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7.15, "y": 3, "w": 1.25},
+        {"matrix": [3, 8], "x": 8.4, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/tominabox1/underscore33/rev2/rules.mk b/keyboards/tominabox1/underscore33/rev2/rules.mk
deleted file mode 100644
index dd8f1a5ae7d..00000000000
--- a/keyboards/tominabox1/underscore33/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 = 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/torn/info.json b/keyboards/torn/info.json
deleted file mode 100644
index c1b83188f06..00000000000
--- a/keyboards/torn/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "keyboard_name": "Torn",
-  "manufacturer": "richard.titmuss",
-  "url": "https://github.com/rtitmuss/torn",
-  "maintainer": "rtitmuss",
-  "usb": {
-    "vid": "0x7274",
-    "pid": "0x0001",
-    "device_version": "0.0.1",
-    "max_power": 100
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B2", "pin_b": "B1"}
-    ]
-  },
-  "processor": "atmega328p",
-  "bootloader": "usbasploader",
-  "layouts": {
-    "LAYOUT_split_3x6_4": {
-      "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": 9, "y": 0.25},
-        {"matrix": [0, 7], "x": 10, "y": 0.125},
-        {"matrix": [0, 8], "x": 11, "y": 0},
-        {"matrix": [0, 9], "x": 12, "y": 0.125},
-        {"matrix": [0, 10], "x": 13, "y": 0.375},
-        {"matrix": [0, 11], "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": [1, 6], "x": 9, "y": 1.25},
-        {"matrix": [1, 7], "x": 10, "y": 1.125},
-        {"matrix": [1, 8], "x": 11, "y": 1},
-        {"matrix": [1, 9], "x": 12, "y": 1.125},
-        {"matrix": [1, 10], "x": 13, "y": 1.375},
-        {"matrix": [1, 11], "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": [2, 6], "x": 9, "y": 2.25},
-        {"matrix": [2, 7], "x": 10, "y": 2.125},
-        {"matrix": [2, 8], "x": 11, "y": 2},
-        {"matrix": [2, 9], "x": 12, "y": 2.125},
-        {"matrix": [2, 10], "x": 13, "y": 2.375},
-        {"matrix": [2, 11], "x": 14, "y": 2.375},
-
-        {"matrix": [3, 2], "x": 3, "y": 3.1},
-        {"matrix": [3, 3], "x": 4, "y": 3.25},
-        {"matrix": [3, 4], "x": 5, "y": 3.4},
-        {"matrix": [3, 5], "x": 6, "y": 3.55},
-
-        {"matrix": [3, 6], "x": 8, "y": 3.55},
-        {"matrix": [3, 7], "x": 9, "y": 3.4},
-        {"matrix": [3, 8], "x": 10, "y": 3.25},
-        {"matrix": [3, 9], "x": 11, "y": 3.1}
-      ]
-    }
-  }
-}
diff --git a/keyboards/torn/keyboard.json b/keyboards/torn/keyboard.json
new file mode 100644
index 00000000000..162e7d08c0e
--- /dev/null
+++ b/keyboards/torn/keyboard.json
@@ -0,0 +1,84 @@
+{
+  "keyboard_name": "Torn",
+  "manufacturer": "richard.titmuss",
+  "url": "https://github.com/rtitmuss/torn",
+  "maintainer": "rtitmuss",
+  "usb": {
+    "vid": "0x7274",
+    "pid": "0x0001",
+    "device_version": "0.0.1",
+    "max_power": 100
+  },
+  "features": {
+    "bootmagic": false,
+    "encoder": true,
+    "extrakey": false,
+    "mousekey": false,
+    "oled": true,
+    "wpm": true
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B2", "pin_b": "B1"}
+    ]
+  },
+  "processor": "atmega328p",
+  "bootloader": "usbasploader",
+  "layouts": {
+    "LAYOUT_split_3x6_4": {
+      "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": 9, "y": 0.25},
+        {"matrix": [0, 7], "x": 10, "y": 0.125},
+        {"matrix": [0, 8], "x": 11, "y": 0},
+        {"matrix": [0, 9], "x": 12, "y": 0.125},
+        {"matrix": [0, 10], "x": 13, "y": 0.375},
+        {"matrix": [0, 11], "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": [1, 6], "x": 9, "y": 1.25},
+        {"matrix": [1, 7], "x": 10, "y": 1.125},
+        {"matrix": [1, 8], "x": 11, "y": 1},
+        {"matrix": [1, 9], "x": 12, "y": 1.125},
+        {"matrix": [1, 10], "x": 13, "y": 1.375},
+        {"matrix": [1, 11], "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": [2, 6], "x": 9, "y": 2.25},
+        {"matrix": [2, 7], "x": 10, "y": 2.125},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2.125},
+        {"matrix": [2, 10], "x": 13, "y": 2.375},
+        {"matrix": [2, 11], "x": 14, "y": 2.375},
+
+        {"matrix": [3, 2], "x": 3, "y": 3.1},
+        {"matrix": [3, 3], "x": 4, "y": 3.25},
+        {"matrix": [3, 4], "x": 5, "y": 3.4},
+        {"matrix": [3, 5], "x": 6, "y": 3.55},
+
+        {"matrix": [3, 6], "x": 8, "y": 3.55},
+        {"matrix": [3, 7], "x": 9, "y": 3.4},
+        {"matrix": [3, 8], "x": 10, "y": 3.25},
+        {"matrix": [3, 9], "x": 11, "y": 3.1}
+      ]
+    }
+  }
+}
diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk
index f855a651a55..213b5db8ab8 100644
--- a/keyboards/torn/rules.mk
+++ b/keyboards/torn/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 = no         # Commands for debug and configuration
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes        # Enable rotary encoder
-OLED_ENABLE = yes
-WPM_ENABLE = yes
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c \
diff --git a/keyboards/touchpad/config.h b/keyboards/touchpad/config.h
index d499fb795c3..f6f58cc5a12 100644
--- a/keyboards/touchpad/config.h
+++ b/keyboards/touchpad/config.h
@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 6
-
-/* 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/touchpad/info.json b/keyboards/touchpad/info.json
deleted file mode 100644
index 7b3cc0950d9..00000000000
--- a/keyboards/touchpad/info.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "keyboard_name": "TouchPad",
-    "manufacturer": "JacoBurge",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x16D0",
-        "pid": "0x0DB8",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_ortho_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": [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": [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": [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": 4},
-                {"matrix": [4, 5], "x": 5, "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/touchpad/keyboard.json b/keyboards/touchpad/keyboard.json
new file mode 100644
index 00000000000..5429b5844db
--- /dev/null
+++ b/keyboards/touchpad/keyboard.json
@@ -0,0 +1,73 @@
+{
+    "keyboard_name": "TouchPad",
+    "manufacturer": "JacoBurge",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x16D0",
+        "pid": "0x0DB8",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_ortho_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": [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": [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": [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": 4},
+                {"matrix": [4, 5], "x": 5, "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/touchpad/rules.mk b/keyboards/touchpad/rules.mk
index b9fb83c48c7..42be966784a 100644
--- a/keyboards/touchpad/rules.mk
+++ b/keyboards/touchpad/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 = 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.
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/keyboards/tweetydabird/lotus58/nanoboot/info.json b/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/lotus58/nanoboot/info.json
rename to keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/info.json b/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/lotus58/rp2040_ce/info.json
rename to keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json
deleted file mode 100644
index d9d0ea30edd..00000000000
--- a/keyboards/ungodly/launch_pad/info.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "keyboard_name": "Launch Pad",
-  "manufacturer": "Ungodly Design",
-  "url": "https://ungodly.design/products/launch-pad",
-  "maintainer": "Ungodly Design",
-  "usb": {
-    "vid": "0x5544",
-    "pid": "0x4C50",
-    "device_version": "99.9.9"
-  },
-  "rgb_matrix": {
-    "animations": {
-      "gradient_left_right": true,
-      "cycle_pinwheel": true
-    },
-    "default": {
-      "animation": "cycle_pinwheel"
-    },
-    "driver": "ws2812",
-    "max_brightness": 150,
-    "sat_steps": 8,
-    "val_steps": 8,
-    "speed_steps": 10,
-    "sleep": true
-  },
-  "matrix_pins": {
-    "cols": ["B0", "B1", "B2", "B3"],
-    "rows": ["D4", "D6", "D7", "B4", "B5"]
-  },
-  "ws2812": {
-    "pin": "F7"
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "C6", "pin_b": "B6", "resolution": 2}
-    ]
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-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}
-        ]
-    }
-  }
-}
diff --git a/keyboards/ungodly/launch_pad/keyboard.json b/keyboards/ungodly/launch_pad/keyboard.json
new file mode 100644
index 00000000000..50b6c2bcbf6
--- /dev/null
+++ b/keyboards/ungodly/launch_pad/keyboard.json
@@ -0,0 +1,87 @@
+{
+  "keyboard_name": "Launch Pad",
+  "manufacturer": "Ungodly Design",
+  "url": "https://ungodly.design/products/launch-pad",
+  "maintainer": "Ungodly Design",
+  "usb": {
+    "vid": "0x5544",
+    "pid": "0x4C50",
+    "device_version": "99.9.9"
+  },
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "bootmagic": true,
+    "encoder": true,
+    "extrakey": true,
+    "midi": true,
+    "mousekey": false,
+    "nkro": true,
+    "oled": true,
+    "rgb_matrix": true,
+    "magic": false,
+    "grave_esc": false,
+    "space_cadet": false
+  },
+  "rgb_matrix": {
+    "animations": {
+      "gradient_left_right": true,
+      "cycle_pinwheel": true
+    },
+    "default": {
+      "animation": "cycle_pinwheel"
+    },
+    "driver": "ws2812",
+    "max_brightness": 150,
+    "sat_steps": 8,
+    "val_steps": 8,
+    "speed_steps": 10,
+    "sleep": true
+  },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3"],
+    "rows": ["D4", "D6", "D7", "B4", "B5"]
+  },
+  "ws2812": {
+    "pin": "F7"
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "C6", "pin_b": "B6", "resolution": 2}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-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}
+        ]
+    }
+  }
+}
diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk
index 31fabc928ca..cc588202788 100644
--- a/keyboards/ungodly/launch_pad/rules.mk
+++ b/keyboards/ungodly/launch_pad/rules.mk
@@ -1,22 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = 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
-MIDI_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-SPACE_CADET_ENABLE = no
-MAGIC_ENABLE = no
-GRAVE_ESC_ENABLE = no
-LTO_ENABLE = yes
-
 ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json
index f92299e9fa4..98138b87dd7 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json
@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json
deleted file mode 100644
index 13615db22d4..00000000000
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "keyboard_name": "Unicomp Classic / Ultra Classic / New M (post-2013)",
-    "manufacturer": "Unicomp/Purdea Andrei",
-    "maintainer": "purdeaandrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "indicators": {
-        "caps_lock": "C11",
-        "num_lock": "C12",
-        "scroll_lock": "C10"
-    },
-    "processor": "STM32F446",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
-        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
-        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
-    }
-}
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..0ef2cc4d5ed
--- /dev/null
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,27 @@
+{
+    "keyboard_name": "Unicomp Classic / Ultra Classic / New M (post-2013)",
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "maintainer": "purdeaandrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
+    "processor": "STM32F446",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    }
+}
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
index a8dcd9418fb..3072222ea6e 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "community_layouts": ["fullsize_ansi", "fullsize_iso"],
     "layouts": {
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json
deleted file mode 100644
index 1c2f5b300bd..00000000000
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "keyboard_name": "Unicomp Classic / Ultra Classic (pre-2013)",
-    "manufacturer": "Unicomp/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
-    "indicators": {
-        "caps_lock": "C11",
-        "num_lock": "C12",
-        "scroll_lock": "C10"
-    },
-    "processor": "STM32F446", // RET6
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
-        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
-        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
-    }
-}
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..30264dd537d
--- /dev/null
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,27 @@
+{
+    "keyboard_name": "Unicomp Classic / Ultra Classic (pre-2013)",
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
+    "processor": "STM32F446", // RET6
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    }
+}
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json
index 162495c25b8..0847f665043 100644
--- a/keyboards/unicomp/pc122/info.json
+++ b/keyboards/unicomp/pc122/info.json
@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/info.json b/keyboards/unicomp/pc122/overnumpad_1xb/info.json
deleted file mode 100644
index 16e39168231..00000000000
--- a/keyboards/unicomp/pc122/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "keyboard_name": "Unicomp PC122",
-    "manufacturer": "Unicomp/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
-    "indicators": {
-        "caps_lock": "C11",
-        "num_lock": "C12",
-        "scroll_lock": "C10"
-    },
-    "processor": "STM32F446", // RET6
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
-        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
-        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
-    }
-}
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..936e286af1d
--- /dev/null
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json
@@ -0,0 +1,27 @@
+{
+    "keyboard_name": "Unicomp PC122",
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
+    "processor": "STM32F446", // RET6
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    }
+}
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json
index 52eb4d80368..f5d783b1265 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json
@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json
deleted file mode 100644
index cf25addc9e2..00000000000
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "keyboard_name": "Unicomp Spacesaver M (post-2013)",
-    "manufacturer": "Unicomp/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
-    "indicators": {
-        "caps_lock": "C12"
-    },
-    "processor": "STM32F446", // RET6
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
-        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
-        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
-    }
-}
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..9fd91ce48fc
--- /dev/null
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,25 @@
+{
+    "keyboard_name": "Unicomp Spacesaver M (post-2013)",
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "indicators": {
+        "caps_lock": "C12"
+    },
+    "processor": "STM32F446", // RET6
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    }
+}
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
index 166baaca416..6ac69a66aab 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json
deleted file mode 100644
index 31fc97a527f..00000000000
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "keyboard_name": "Unicomp Spacesaver M (pre-2013)",
-    "manufacturer": "Unicomp/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
-    "indicators": {
-        "caps_lock": "C12"
-    },
-    "processor": "STM32F446", // RET6
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
-        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
-        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
-    }
-}
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..db772e46e24
--- /dev/null
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,25 @@
+{
+    "keyboard_name": "Unicomp Spacesaver M (pre-2013)",
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "indicators": {
+        "caps_lock": "C12"
+    },
+    "processor": "STM32F446", // RET6
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    }
+}
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
deleted file mode 100644
index d85d76b785e..00000000000
--- a/keyboards/unikeyboard/diverge3/info.json
+++ /dev/null
@@ -1,114 +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": {
-    "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/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 fd50645e4a1..00000000000
--- a/keyboards/unikeyboard/diverge3/rules.mk
+++ /dev/null
@@ -1,12 +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.
diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json
deleted file mode 100644
index d68c4da94b5..00000000000
--- a/keyboards/unikeyboard/divergetm2/info.json
+++ /dev/null
@@ -1,84 +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": {
-        "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/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/rules.mk b/keyboards/unikeyboard/divergetm2/rules.mk
deleted file mode 100644
index e39bab4422a..00000000000
--- a/keyboards/unikeyboard/divergetm2/rules.mk
+++ /dev/null
@@ -1,12 +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.
diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json
deleted file mode 100644
index 7b182df2515..00000000000
--- a/keyboards/unison/v04/info.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
-    "keyboard_name": "Unison",
-    "manufacturer": "jpskenn",
-    "url": "https://github.com/jpskenn/Unison",
-    "maintainer": "jpskenn",
-    "usb": {
-        "vid": "0xB9DD",
-        "pid": "0x176A",
-        "device_version": "0.4.0"
-    },
-    "matrix_pins": {
-        "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"],
-        "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]
-    },
-    "rgblight": {
-        "hue_steps": 4,
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 7,
-        "led_map": [1, 2, 0, 3, 4, 5, 6],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B0", "pin_b": "B1"},
-            {"pin_a": "D2", "pin_b": "D3"},
-            {"pin_a": "D5", "pin_b": "D4"},
-            {"pin_a": "D6", "pin_b": "D7"},
-            {"pin_a": "B4", "pin_b": "B5"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [5, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [5, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [5, 2], "x": 4, "y": 0},
-                {"matrix": [0, 3], "x": 5, "y": 0},
-                {"matrix": [5, 3], "x": 6, "y": 0},
-                {"matrix": [0, 4], "x": 7, "y": 0},
-                {"matrix": [5, 4], "x": 8, "y": 0},
-                {"matrix": [0, 5], "x": 9, "y": 0},
-                {"matrix": [5, 6], "x": 10, "y": 0},
-                {"matrix": [0, 6], "x": 11, "y": 0},
-                {"matrix": [5, 7], "x": 12, "y": 0},
-                {"matrix": [0, 7], "x": 13, "y": 0},
-                {"matrix": [5, 8], "x": 14, "y": 0},
-                {"matrix": [0, 8], "x": 15, "y": 0},
-                {"matrix": [5, 9], "x": 16, "y": 0},
-
-                {"matrix": [6, 0], "x": 0, "y": 1},
-                {"matrix": [1, 0], "x": 1, "y": 1},
-                {"matrix": [6, 1], "x": 2, "y": 1},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [6, 2], "x": 4, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 5.5, "y": 1},
-                {"matrix": [6, 3], "x": 6.5, "y": 1},
-                {"matrix": [1, 4], "x": 7.5, "y": 1},
-                {"matrix": [6, 4], "x": 8.5, "y": 1},
-                {"matrix": [1, 5], "x": 9.5, "y": 1},
-                {"matrix": [6, 5], "x": 10.5, "y": 1},
-                {"matrix": [1, 6], "x": 11.5, "y": 1},
-                {"matrix": [6, 7], "x": 12.5, "y": 1},
-                {"matrix": [1, 7], "x": 13.5, "y": 1},
-                {"matrix": [6, 8], "x": 14.5, "y": 1},
-                {"matrix": [6, 9], "x": 15.5, "y": 1, "w": 1.5},
-
-                {"matrix": [7, 0], "x": 0, "y": 2},
-                {"matrix": [2, 0], "x": 1, "y": 2},
-                {"matrix": [7, 1], "x": 2, "y": 2},
-                {"matrix": [2, 1], "x": 3, "y": 2},
-                {"matrix": [7, 2], "x": 4, "y": 2, "w": 1.5},
-                {"matrix": [2, 3], "x": 5.5, "y": 2},
-                {"matrix": [7, 3], "x": 6.5, "y": 2},
-                {"matrix": [2, 4], "x": 7.5, "y": 2},
-                {"matrix": [7, 4], "x": 8.5, "y": 2},
-                {"matrix": [2, 5], "x": 9.5, "y": 2},
-                {"matrix": [7, 5], "x": 10.5, "y": 2},
-                {"matrix": [2, 6], "x": 11.5, "y": 2},
-                {"matrix": [7, 6], "x": 12.5, "y": 2},
-                {"matrix": [2, 7], "x": 13.5, "y": 2},
-                {"matrix": [7, 8], "x": 14.5, "y": 2},
-                {"matrix": [7, 9], "x": 15.5, "y": 2, "w": 1.5},
-
-                {"matrix": [8, 0], "x": 0, "y": 3},
-                {"matrix": [3, 0], "x": 1, "y": 3},
-                {"matrix": [8, 1], "x": 2, "y": 3},
-                {"matrix": [3, 1], "x": 3, "y": 3},
-                {"matrix": [8, 2], "x": 4, "y": 3},
-                {"matrix": [3, 2], "x": 5, "y": 3},
-                {"matrix": [8, 3], "x": 6, "y": 3},
-                {"matrix": [3, 4], "x": 7, "y": 3},
-                {"matrix": [8, 4], "x": 8, "y": 3},
-                {"matrix": [3, 5], "x": 9, "y": 3},
-                {"matrix": [8, 5], "x": 10, "y": 3},
-                {"matrix": [3, 6], "x": 11, "y": 3},
-                {"matrix": [8, 6], "x": 12, "y": 3},
-                {"matrix": [3, 7], "x": 13, "y": 3},
-                {"matrix": [8, 7], "x": 14, "y": 3},
-                {"matrix": [3, 8], "x": 15, "y": 3},
-                {"matrix": [8, 9], "x": 16, "y": 3},
-
-                {"matrix": [9, 0], "x": 0, "y": 4},
-                {"matrix": [4, 0], "x": 1, "y": 4},
-                {"matrix": [9, 1], "x": 2, "y": 4},
-                {"matrix": [4, 1], "x": 3, "y": 4},
-                {"matrix": [9, 2], "x": 4, "y": 4},
-                {"matrix": [4, 2], "x": 5, "y": 4},
-                {"matrix": [9, 3], "x": 6, "y": 4},
-                {"matrix": [4, 3], "x": 7, "y": 4},
-                {"matrix": [9, 4], "x": 8, "y": 4},
-                {"matrix": [4, 5], "x": 9, "y": 4},
-                {"matrix": [9, 5], "x": 10, "y": 4},
-                {"matrix": [4, 6], "x": 11, "y": 4},
-                {"matrix": [9, 6], "x": 12, "y": 4},
-                {"matrix": [4, 7], "x": 13, "y": 4},
-                {"matrix": [9, 7], "x": 14, "y": 4},
-                {"matrix": [4, 8], "x": 15, "y": 4},
-                {"matrix": [9, 8], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_music": {
-            "layout": [
-                {"matrix": [5, 1], "x": 2, "y": 0},
-                {"matrix": [5, 2], "x": 4, "y": 0},
-                {"matrix": [0, 3], "x": 5, "y": 0},
-                {"matrix": [5, 3], "x": 6, "y": 0},
-                {"matrix": [0, 4], "x": 7, "y": 0},
-                {"matrix": [0, 5], "x": 9, "y": 0},
-                {"matrix": [0, 6], "x": 11, "y": 0},
-                {"matrix": [0, 7], "x": 13, "y": 0},
-                {"matrix": [0, 8], "x": 15, "y": 0},
-
-                {"matrix": [6, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 0], "x": 1, "y": 1.25},
-                {"matrix": [6, 1], "x": 2, "y": 1.25},
-                {"matrix": [1, 2], "x": 3, "y": 1.25},
-                {"matrix": [6, 2], "x": 4, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 3], "x": 5.5, "y": 1.25},
-                {"matrix": [6, 3], "x": 6.5, "y": 1.25},
-                {"matrix": [1, 4], "x": 7.5, "y": 1.25},
-                {"matrix": [6, 4], "x": 8.5, "y": 1.25},
-                {"matrix": [1, 5], "x": 9.5, "y": 1.25},
-                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
-                {"matrix": [1, 6], "x": 11.5, "y": 1.25},
-                {"matrix": [6, 7], "x": 12.5, "y": 1.25},
-                {"matrix": [1, 7], "x": 13.5, "y": 1.25},
-                {"matrix": [6, 8], "x": 14.5, "y": 1.25},
-                {"matrix": [6, 9], "x": 15.5, "y": 1.25, "w": 1.5},
-
-                {"matrix": [7, 0], "x": 0, "y": 2.25},
-                {"matrix": [2, 0], "x": 1, "y": 2.25},
-                {"matrix": [7, 1], "x": 2, "y": 2.25},
-                {"matrix": [2, 1], "x": 3, "y": 2.25},
-                {"matrix": [7, 2], "x": 4, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 3], "x": 5.5, "y": 2.25},
-                {"matrix": [7, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 7.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 9.5, "y": 2.25},
-                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 11.5, "y": 2.25},
-                {"matrix": [7, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 13.5, "y": 2.25},
-                {"matrix": [7, 8], "x": 14.5, "y": 2.25},
-                {"matrix": [7, 9], "x": 15.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [8, 0], "x": 0, "y": 3.25},
-                {"matrix": [3, 0], "x": 1, "y": 3.25},
-                {"matrix": [8, 1], "x": 2, "y": 3.25},
-                {"matrix": [3, 1], "x": 3, "y": 3.25},
-                {"matrix": [8, 2], "x": 4, "y": 3.25},
-                {"matrix": [3, 2], "x": 5, "y": 3.25},
-                {"matrix": [8, 3], "x": 6, "y": 3.25},
-                {"matrix": [3, 4], "x": 7, "y": 3.25},
-                {"matrix": [8, 4], "x": 8, "y": 3.25},
-                {"matrix": [3, 5], "x": 9, "y": 3.25},
-                {"matrix": [8, 5], "x": 10, "y": 3.25},
-                {"matrix": [3, 6], "x": 11, "y": 3.25},
-                {"matrix": [8, 6], "x": 12, "y": 3.25},
-                {"matrix": [3, 7], "x": 13, "y": 3.25},
-                {"matrix": [8, 7], "x": 14, "y": 3.25},
-                {"matrix": [3, 8], "x": 15, "y": 3.25},
-                {"matrix": [8, 9], "x": 16, "y": 3.25},
-
-                {"matrix": [9, 0], "x": 0, "y": 4.25},
-                {"matrix": [4, 0], "x": 1, "y": 4.25},
-                {"matrix": [9, 1], "x": 2, "y": 4.25},
-                {"matrix": [4, 1], "x": 3, "y": 4.25},
-                {"matrix": [9, 2], "x": 4, "y": 4.25},
-                {"matrix": [4, 2], "x": 5, "y": 4.25},
-                {"matrix": [9, 3], "x": 6, "y": 4.25},
-                {"matrix": [4, 3], "x": 7, "y": 4.25},
-                {"matrix": [9, 4], "x": 8, "y": 4.25},
-                {"matrix": [4, 5], "x": 9, "y": 4.25},
-                {"matrix": [9, 5], "x": 10, "y": 4.25},
-                {"matrix": [4, 6], "x": 11, "y": 4.25},
-                {"matrix": [9, 6], "x": 12, "y": 4.25},
-                {"matrix": [4, 7], "x": 13, "y": 4.25},
-                {"matrix": [9, 7], "x": 14, "y": 4.25},
-                {"matrix": [4, 8], "x": 15, "y": 4.25},
-                {"matrix": [9, 8], "x": 16, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/unison/v04/keyboard.json b/keyboards/unison/v04/keyboard.json
new file mode 100644
index 00000000000..14f495aa2ca
--- /dev/null
+++ b/keyboards/unison/v04/keyboard.json
@@ -0,0 +1,233 @@
+{
+    "keyboard_name": "Unison",
+    "manufacturer": "jpskenn",
+    "url": "https://github.com/jpskenn/Unison",
+    "maintainer": "jpskenn",
+    "usb": {
+        "vid": "0xB9DD",
+        "pid": "0x176A",
+        "device_version": "0.4.0"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"],
+        "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]
+    },
+    "rgblight": {
+        "hue_steps": 4,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 7,
+        "led_map": [1, 2, 0, 3, 4, 5, 6],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B0", "pin_b": "B1"},
+            {"pin_a": "D2", "pin_b": "D3"},
+            {"pin_a": "D5", "pin_b": "D4"},
+            {"pin_a": "D6", "pin_b": "D7"},
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [5, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [5, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [5, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0},
+                {"matrix": [5, 3], "x": 6, "y": 0},
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [5, 4], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [5, 6], "x": 10, "y": 0},
+                {"matrix": [0, 6], "x": 11, "y": 0},
+                {"matrix": [5, 7], "x": 12, "y": 0},
+                {"matrix": [0, 7], "x": 13, "y": 0},
+                {"matrix": [5, 8], "x": 14, "y": 0},
+                {"matrix": [0, 8], "x": 15, "y": 0},
+                {"matrix": [5, 9], "x": 16, "y": 0},
+
+                {"matrix": [6, 0], "x": 0, "y": 1},
+                {"matrix": [1, 0], "x": 1, "y": 1},
+                {"matrix": [6, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [6, 2], "x": 4, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 5.5, "y": 1},
+                {"matrix": [6, 3], "x": 6.5, "y": 1},
+                {"matrix": [1, 4], "x": 7.5, "y": 1},
+                {"matrix": [6, 4], "x": 8.5, "y": 1},
+                {"matrix": [1, 5], "x": 9.5, "y": 1},
+                {"matrix": [6, 5], "x": 10.5, "y": 1},
+                {"matrix": [1, 6], "x": 11.5, "y": 1},
+                {"matrix": [6, 7], "x": 12.5, "y": 1},
+                {"matrix": [1, 7], "x": 13.5, "y": 1},
+                {"matrix": [6, 8], "x": 14.5, "y": 1},
+                {"matrix": [6, 9], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [7, 0], "x": 0, "y": 2},
+                {"matrix": [2, 0], "x": 1, "y": 2},
+                {"matrix": [7, 1], "x": 2, "y": 2},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [7, 2], "x": 4, "y": 2, "w": 1.5},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [7, 3], "x": 6.5, "y": 2},
+                {"matrix": [2, 4], "x": 7.5, "y": 2},
+                {"matrix": [7, 4], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.5, "y": 2},
+                {"matrix": [7, 5], "x": 10.5, "y": 2},
+                {"matrix": [2, 6], "x": 11.5, "y": 2},
+                {"matrix": [7, 6], "x": 12.5, "y": 2},
+                {"matrix": [2, 7], "x": 13.5, "y": 2},
+                {"matrix": [7, 8], "x": 14.5, "y": 2},
+                {"matrix": [7, 9], "x": 15.5, "y": 2, "w": 1.5},
+
+                {"matrix": [8, 0], "x": 0, "y": 3},
+                {"matrix": [3, 0], "x": 1, "y": 3},
+                {"matrix": [8, 1], "x": 2, "y": 3},
+                {"matrix": [3, 1], "x": 3, "y": 3},
+                {"matrix": [8, 2], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [8, 3], "x": 6, "y": 3},
+                {"matrix": [3, 4], "x": 7, "y": 3},
+                {"matrix": [8, 4], "x": 8, "y": 3},
+                {"matrix": [3, 5], "x": 9, "y": 3},
+                {"matrix": [8, 5], "x": 10, "y": 3},
+                {"matrix": [3, 6], "x": 11, "y": 3},
+                {"matrix": [8, 6], "x": 12, "y": 3},
+                {"matrix": [3, 7], "x": 13, "y": 3},
+                {"matrix": [8, 7], "x": 14, "y": 3},
+                {"matrix": [3, 8], "x": 15, "y": 3},
+                {"matrix": [8, 9], "x": 16, "y": 3},
+
+                {"matrix": [9, 0], "x": 0, "y": 4},
+                {"matrix": [4, 0], "x": 1, "y": 4},
+                {"matrix": [9, 1], "x": 2, "y": 4},
+                {"matrix": [4, 1], "x": 3, "y": 4},
+                {"matrix": [9, 2], "x": 4, "y": 4},
+                {"matrix": [4, 2], "x": 5, "y": 4},
+                {"matrix": [9, 3], "x": 6, "y": 4},
+                {"matrix": [4, 3], "x": 7, "y": 4},
+                {"matrix": [9, 4], "x": 8, "y": 4},
+                {"matrix": [4, 5], "x": 9, "y": 4},
+                {"matrix": [9, 5], "x": 10, "y": 4},
+                {"matrix": [4, 6], "x": 11, "y": 4},
+                {"matrix": [9, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13, "y": 4},
+                {"matrix": [9, 7], "x": 14, "y": 4},
+                {"matrix": [4, 8], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_music": {
+            "layout": [
+                {"matrix": [5, 1], "x": 2, "y": 0},
+                {"matrix": [5, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0},
+                {"matrix": [5, 3], "x": 6, "y": 0},
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 11, "y": 0},
+                {"matrix": [0, 7], "x": 13, "y": 0},
+                {"matrix": [0, 8], "x": 15, "y": 0},
+
+                {"matrix": [6, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1, "y": 1.25},
+                {"matrix": [6, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [6, 2], "x": 4, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 7.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 9.5, "y": 1.25},
+                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 11.5, "y": 1.25},
+                {"matrix": [6, 7], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 13.5, "y": 1.25},
+                {"matrix": [6, 8], "x": 14.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 15.5, "y": 1.25, "w": 1.5},
+
+                {"matrix": [7, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [7, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 1], "x": 3, "y": 2.25},
+                {"matrix": [7, 2], "x": 4, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 8], "x": 14.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 15.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 0], "x": 1, "y": 3.25},
+                {"matrix": [8, 1], "x": 2, "y": 3.25},
+                {"matrix": [3, 1], "x": 3, "y": 3.25},
+                {"matrix": [8, 2], "x": 4, "y": 3.25},
+                {"matrix": [3, 2], "x": 5, "y": 3.25},
+                {"matrix": [8, 3], "x": 6, "y": 3.25},
+                {"matrix": [3, 4], "x": 7, "y": 3.25},
+                {"matrix": [8, 4], "x": 8, "y": 3.25},
+                {"matrix": [3, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 5], "x": 10, "y": 3.25},
+                {"matrix": [3, 6], "x": 11, "y": 3.25},
+                {"matrix": [8, 6], "x": 12, "y": 3.25},
+                {"matrix": [3, 7], "x": 13, "y": 3.25},
+                {"matrix": [8, 7], "x": 14, "y": 3.25},
+                {"matrix": [3, 8], "x": 15, "y": 3.25},
+                {"matrix": [8, 9], "x": 16, "y": 3.25},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 0], "x": 1, "y": 4.25},
+                {"matrix": [9, 1], "x": 2, "y": 4.25},
+                {"matrix": [4, 1], "x": 3, "y": 4.25},
+                {"matrix": [9, 2], "x": 4, "y": 4.25},
+                {"matrix": [4, 2], "x": 5, "y": 4.25},
+                {"matrix": [9, 3], "x": 6, "y": 4.25},
+                {"matrix": [4, 3], "x": 7, "y": 4.25},
+                {"matrix": [9, 4], "x": 8, "y": 4.25},
+                {"matrix": [4, 5], "x": 9, "y": 4.25},
+                {"matrix": [9, 5], "x": 10, "y": 4.25},
+                {"matrix": [4, 6], "x": 11, "y": 4.25},
+                {"matrix": [9, 6], "x": 12, "y": 4.25},
+                {"matrix": [4, 7], "x": 13, "y": 4.25},
+                {"matrix": [9, 7], "x": 14, "y": 4.25},
+                {"matrix": [4, 8], "x": 15, "y": 4.25},
+                {"matrix": [9, 8], "x": 16, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/unison/v04/rules.mk b/keyboards/unison/v04/rules.mk
deleted file mode 100644
index b4fc6e0d29e..00000000000
--- a/keyboards/unison/v04/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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no         # Rotary Encoder
-
-LTO_ENABLE = yes
diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
deleted file mode 100644
index c7d6f7159bb..00000000000
--- a/keyboards/uzu42/rev1/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "keyboard_name": "uzu42",
-  "manufacturer": "nrtkbb",
-  "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42",
-  "maintainer": "nrtkbb",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x3060",
-    "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"
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "rgblight": {
-    "hue_steps": 10,
-    "led_count": 54,
-    "max_brightness": 120,
-    "split_count": [27, 27],
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "twinkle": true
-    }
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0.375, "y": 0},
-        {"matrix": [0, 1], "x": 1.375, "y": 0},
-        {"matrix": [0, 2], "x": 2.375, "y": 0},
-        {"matrix": [0, 3], "x": 3.375, "y": 0.125},
-        {"matrix": [0, 4], "x": 4.375, "y": 0.25},
-
-        {"matrix": [4, 4], "x": 7.625, "y": 0.25},
-        {"matrix": [4, 3], "x": 8.625, "y": 0.125},
-        {"matrix": [4, 2], "x": 9.625, "y": 0},
-        {"matrix": [4, 1], "x": 10.625, "y": 0},
-        {"matrix": [4, 0], "x": 11.625, "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.125},
-        {"matrix": [1, 4], "x": 4.25, "y": 1.25},
-
-        {"matrix": [5, 4], "x": 7.75, "y": 1.25},
-        {"matrix": [5, 3], "x": 8.75, "y": 1.125},
-        {"matrix": [5, 2], "x": 9.75, "y": 1},
-        {"matrix": [5, 1], "x": 10.75, "y": 1},
-        {"matrix": [5, 0], "x": 11.75, "y": 1},
-
-        {"matrix": [2, 0], "x": 0.125, "y": 2},
-        {"matrix": [2, 1], "x": 1.125, "y": 2},
-        {"matrix": [2, 2], "x": 2.125, "y": 2},
-        {"matrix": [2, 3], "x": 3.125, "y": 2.125},
-        {"matrix": [2, 4], "x": 4.125, "y": 2.25},
-
-        {"matrix": [6, 4], "x": 7.875, "y": 2.25},
-        {"matrix": [6, 3], "x": 8.875, "y": 2.125},
-        {"matrix": [6, 2], "x": 9.875, "y": 2},
-        {"matrix": [6, 1], "x": 10.875, "y": 2},
-        {"matrix": [6, 0], "x": 11.875, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3.05},
-        {"matrix": [3, 3], "x": 3, "y": 3.18},
-        {"matrix": [3, 4], "x": 4, "y": 3.3},
-        {"matrix": [3, 5], "x": 5, "y": 3.43},
-
-        {"matrix": [7, 5], "x": 7, "y": 3.43},
-        {"matrix": [7, 4], "x": 8, "y": 3.3},
-        {"matrix": [7, 3], "x": 9, "y": 3.18},
-        {"matrix": [7, 2], "x": 10, "y": 3.05},
-        {"matrix": [7, 1], "x": 11, "y": 3},
-        {"matrix": [7, 0], "x": 12, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/uzu42/rev1/keyboard.json b/keyboards/uzu42/rev1/keyboard.json
new file mode 100644
index 00000000000..71d9f424cc8
--- /dev/null
+++ b/keyboards/uzu42/rev1/keyboard.json
@@ -0,0 +1,103 @@
+{
+  "keyboard_name": "uzu42",
+  "manufacturer": "nrtkbb",
+  "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42",
+  "maintainer": "nrtkbb",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3060",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "extrakey": false,
+    "mousekey": false,
+    "nkro": false,
+    "rgblight": 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"
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 54,
+    "max_brightness": 120,
+    "split_count": [27, 27],
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "twinkle": true
+    }
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0.375, "y": 0},
+        {"matrix": [0, 1], "x": 1.375, "y": 0},
+        {"matrix": [0, 2], "x": 2.375, "y": 0},
+        {"matrix": [0, 3], "x": 3.375, "y": 0.125},
+        {"matrix": [0, 4], "x": 4.375, "y": 0.25},
+
+        {"matrix": [4, 4], "x": 7.625, "y": 0.25},
+        {"matrix": [4, 3], "x": 8.625, "y": 0.125},
+        {"matrix": [4, 2], "x": 9.625, "y": 0},
+        {"matrix": [4, 1], "x": 10.625, "y": 0},
+        {"matrix": [4, 0], "x": 11.625, "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.125},
+        {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+
+        {"matrix": [5, 4], "x": 7.75, "y": 1.25},
+        {"matrix": [5, 3], "x": 8.75, "y": 1.125},
+        {"matrix": [5, 2], "x": 9.75, "y": 1},
+        {"matrix": [5, 1], "x": 10.75, "y": 1},
+        {"matrix": [5, 0], "x": 11.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0.125, "y": 2},
+        {"matrix": [2, 1], "x": 1.125, "y": 2},
+        {"matrix": [2, 2], "x": 2.125, "y": 2},
+        {"matrix": [2, 3], "x": 3.125, "y": 2.125},
+        {"matrix": [2, 4], "x": 4.125, "y": 2.25},
+
+        {"matrix": [6, 4], "x": 7.875, "y": 2.25},
+        {"matrix": [6, 3], "x": 8.875, "y": 2.125},
+        {"matrix": [6, 2], "x": 9.875, "y": 2},
+        {"matrix": [6, 1], "x": 10.875, "y": 2},
+        {"matrix": [6, 0], "x": 11.875, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3.05},
+        {"matrix": [3, 3], "x": 3, "y": 3.18},
+        {"matrix": [3, 4], "x": 4, "y": 3.3},
+        {"matrix": [3, 5], "x": 5, "y": 3.43},
+
+        {"matrix": [7, 5], "x": 7, "y": 3.43},
+        {"matrix": [7, 4], "x": 8, "y": 3.3},
+        {"matrix": [7, 3], "x": 9, "y": 3.18},
+        {"matrix": [7, 2], "x": 10, "y": 3.05},
+        {"matrix": [7, 1], "x": 11, "y": 3},
+        {"matrix": [7, 0], "x": 12, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/rev1/rev1.c
similarity index 100%
rename from keyboards/uzu42/uzu42.c
rename to keyboards/uzu42/rev1/rev1.c
diff --git a/keyboards/uzu42/rev1/rules.mk b/keyboards/uzu42/rev1/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/uzu42/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk
index 49b64b12745..277e74b7153 100644
--- a/keyboards/uzu42/rules.mk
+++ b/keyboards/uzu42/rules.mk
@@ -1,15 +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.
-OLED_ENABLE = no      # OLED display
-
 DEFAULT_FOLDER = uzu42/rev1
diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/info.json
deleted file mode 100644
index 6959188be9a..00000000000
--- a/keyboards/v4n4g0rth0n/v2/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"],
-        "rows": ["C7", "C6", "B6", "B5", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/v4n4g0rth0n/v2/keyboard.json b/keyboards/v4n4g0rth0n/v2/keyboard.json
new file mode 100644
index 00000000000..c43848178f2
--- /dev/null
+++ b/keyboards/v4n4g0rth0n/v2/keyboard.json
@@ -0,0 +1,19 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"],
+        "rows": ["C7", "C6", "B6", "B5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/v4n4g0rth0n/v2/rules.mk b/keyboards/v4n4g0rth0n/v2/rules.mk
index 01145044866..cc588202788 100644
--- a/keyboards/v4n4g0rth0n/v2/rules.mk
+++ b/keyboards/v4n4g0rth0n/v2/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 = 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
-
 ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/info.json
deleted file mode 100644
index 096e89555aa..00000000000
--- a/keyboards/vertex/angle65/info.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "keyboard_name": "ANGLE65",
-    "manufacturer": "vertex",
-    "url": "",
-    "maintainer": "EasonQian1, Vertex-kb",
-    "usb": {
-        "vid": "0x9954",
-        "pid": "0x9970",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "matrix_pins": {
-        "rows": ["B10", "B1", "B0", "A7", "A6"],
-        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C13",
-        "on_state": 0
-    },
-    "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"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "K00 (B10,B9)", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K01 (B10,B8)", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K02 (B10,B7)", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K03 (B10,B6)", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K04 (B10,B5)", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K05 (B10,B4)", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K06 (B10,B3)", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K07 (B10,B11)", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K08 (B10,A15)", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09 (B10,A10)", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A (B10,A9)", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B (B10,B14)", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "K0C (B10,B13)", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D (B10,B12)", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "K0E (B10,A5)", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "K10 (B1,B9)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "K11 (B1,B8)", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "K12 (B1,B7)", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "K13 (B1,B6)", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "K14 (B1,B5)", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "K15 (B1,B4)", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "K16 (B1,B3)", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "K17 (B1,B11)", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "K18 (B1,A15)", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "K19 (B1,A10)", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "K1A (B1,A9)", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "K1B (B1,B14)", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "K1C (B1,B13)", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "K1D (B1,B12)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "K1E (B1,A5)", "matrix": [1, 14], "x": 15, "y": 1},
-                {"label": "K20 (B0,B9)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "K21 (B0,B8)", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "K22 (B0,B7)", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "K23 (B0,B6)", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "K24 (B0,B5)", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "K25 (B0,B4)", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "K26 (B0,B3)", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "K27 (B0,B11)", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K28 (B0,A15)", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29 (B0,A10)", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A (B0,A9)", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B (B0,B14)", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K2C (B0,B13)", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "K2D (B0,B12)", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-                {"label": "K2E (B0,A5)", "matrix": [2, 14], "x": 15, "y": 2},
-                {"label": "K30 (A7,B9)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "K31 (A7,B8)", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "K32 (A7,B7)", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "K33 (A7,B6)", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "K34 (A7,B5)", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "K35 (A7,B4)", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "K36 (A7,B3)", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "K37 (A7,B11)", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "K38 (A7,A15)", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "K39 (A7,A10)", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": "K3A (A7,A9)", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "K3B (A7,B14)", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "K3C (A7,B13)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "K3D (A7,B12)", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "K3E (A7,A5)", "matrix": [3, 14], "x": 15, "y": 3},
-                {"label": "K40 (A6,B9)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "K41 (A6,B8)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "K42 (A6,B7)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "K46 (A6,B3)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "K4A (A6,A9)", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "K4B (A6,B14)", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "K4C (A6,B13)", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "K4D (A6,B12)", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "K4E (A6,A5)", "matrix": [4, 14], "x": 15, "y": 4}
-           ]
-        }
-    }
-}
diff --git a/keyboards/vertex/angle65/keyboard.json b/keyboards/vertex/angle65/keyboard.json
new file mode 100644
index 00000000000..962b3fd4f11
--- /dev/null
+++ b/keyboards/vertex/angle65/keyboard.json
@@ -0,0 +1,126 @@
+{
+    "keyboard_name": "ANGLE65",
+    "manufacturer": "vertex",
+    "url": "",
+    "maintainer": "EasonQian1, Vertex-kb",
+    "usb": {
+        "vid": "0x9954",
+        "pid": "0x9970",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "matrix_pins": {
+        "rows": ["B10", "B1", "B0", "A7", "A6"],
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
+    "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"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00 (B10,B9)", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01 (B10,B8)", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02 (B10,B7)", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03 (B10,B6)", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04 (B10,B5)", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05 (B10,B4)", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06 (B10,B3)", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07 (B10,B11)", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08 (B10,A15)", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09 (B10,A10)", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A (B10,A9)", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B (B10,B14)", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C (B10,B13)", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D (B10,B12)", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E (B10,A5)", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K10 (B1,B9)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11 (B1,B8)", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12 (B1,B7)", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13 (B1,B6)", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14 (B1,B5)", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15 (B1,B4)", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16 (B1,B3)", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17 (B1,B11)", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18 (B1,A15)", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19 (B1,A10)", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A (B1,A9)", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B (B1,B14)", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C (B1,B13)", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D (B1,B12)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "K1E (B1,A5)", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "K20 (B0,B9)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21 (B0,B8)", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22 (B0,B7)", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23 (B0,B6)", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24 (B0,B5)", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25 (B0,B4)", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26 (B0,B3)", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27 (B0,B11)", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28 (B0,A15)", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29 (B0,A10)", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A (B0,A9)", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B (B0,B14)", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C (B0,B13)", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "K2D (B0,B12)", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"label": "K2E (B0,A5)", "matrix": [2, 14], "x": 15, "y": 2},
+                {"label": "K30 (A7,B9)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31 (A7,B8)", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32 (A7,B7)", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33 (A7,B6)", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34 (A7,B5)", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35 (A7,B4)", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36 (A7,B3)", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37 (A7,B11)", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38 (A7,A15)", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39 (A7,A10)", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A (A7,A9)", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B (A7,B14)", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C (A7,B13)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D (A7,B12)", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E (A7,A5)", "matrix": [3, 14], "x": 15, "y": 3},
+                {"label": "K40 (A6,B9)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41 (A6,B8)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42 (A6,B7)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46 (A6,B3)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A (A6,A9)", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B (A6,B14)", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C (A6,B13)", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D (A6,B12)", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E (A6,A5)", "matrix": [4, 14], "x": 15, "y": 4}
+           ]
+        }
+    }
+}
diff --git a/keyboards/vertex/angle65/rules.mk b/keyboards/vertex/angle65/rules.mk
index 330f6ff76b8..a521203b326 100644
--- a/keyboards/vertex/angle65/rules.mk
+++ b/keyboards/vertex/angle65/rules.mk
@@ -1,15 +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 = 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
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json
deleted file mode 100644
index 7928430015d..00000000000
--- a/keyboards/viktus/minne_topre/info.json
+++ /dev/null
@@ -1,256 +0,0 @@
-{
-    "manufacturer": "Viktus Design LLC",
-    "keyboard_name": "Viktus Minne - Topre",
-    "maintainer": "BlindAssassin111",
-    "url": "https://viktus.design",
-    "usb": {
-        "device_version": "1.3.0",
-        "vid": "0x5644",
-        "pid": "0x4D54"
-    },
-    "bootloader": "atmel-dfu",
-    "processor": "atmega32u4",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "bootmagic": {
-        "matrix": [0, 0]
-    },
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
-        "rows": ["A0", "A1", "A3", "A4"]
-    },
-    "layouts": {
-        "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "x": 5.875, "y": 3},
-                {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
-            ]
-        },
-        "LAYOUT_dual_3u": {
-            "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3},
-                {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
-            ]
-        },
-        "LAYOUT_6u": {
-            "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
-            ]
-        },
-        "LAYOUT_7u": {
-            "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3}
-            ]
-        },
-        "LAYOUT_10u": {
-            "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/viktus/minne_topre/keyboard.json b/keyboards/viktus/minne_topre/keyboard.json
new file mode 100644
index 00000000000..6919e7f9ccd
--- /dev/null
+++ b/keyboards/viktus/minne_topre/keyboard.json
@@ -0,0 +1,253 @@
+{
+    "manufacturer": "Viktus Design LLC",
+    "keyboard_name": "Viktus Minne - Topre",
+    "maintainer": "BlindAssassin111",
+    "url": "https://viktus.design",
+    "usb": {
+        "device_version": "1.3.0",
+        "vid": "0x5644",
+        "pid": "0x4D54"
+    },
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
+        "rows": ["A0", "A1", "A3", "A4"]
+    },
+    "layouts": {
+        "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.875, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+            ]
+        },
+        "LAYOUT_dual_3u": {
+            "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+            ]
+        },
+        "LAYOUT_6u": {
+            "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+            ]
+        },
+        "LAYOUT_7u": {
+            "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3}
+            ]
+        },
+        "LAYOUT_10u": {
+            "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": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "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": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/viktus/osav2_numpad_topre/info.json b/keyboards/viktus/osav2_numpad_topre/keyboard.json
similarity index 100%
rename from keyboards/viktus/osav2_numpad_topre/info.json
rename to keyboards/viktus/osav2_numpad_topre/keyboard.json
diff --git a/keyboards/viktus/osav2_topre/info.json b/keyboards/viktus/osav2_topre/keyboard.json
similarity index 100%
rename from keyboards/viktus/osav2_topre/info.json
rename to keyboards/viktus/osav2_topre/keyboard.json
diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/info.json
deleted file mode 100644
index 67f5b63bcaf..00000000000
--- a/keyboards/viktus/sp111/info.json
+++ /dev/null
@@ -1,745 +0,0 @@
-{
-    "keyboard_name": "SP111",
-    "manufacturer": "Viktus Design LLC",
-    "url": "https://thekey.company/products/sp-111",
-    "maintainer": "blindassassin111",
-    "usb": {
-        "vid": "0x5644",
-        "pid": "0x5111",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
-                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
-                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
-                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
-                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
-                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
-                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
-                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
-                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
-                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
-                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
-                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
-                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
-                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
-                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
-                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
-                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
-                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
-                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
-                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
-                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
-                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
-
-                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
-                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
-                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
-                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
-                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
-                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
-                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
-                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
-                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
-                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
-                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
-                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
-                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
-                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
-                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
-
-                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
-                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
-                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
-                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
-                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
-                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
-                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
-                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
-                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
-                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
-                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
-                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
-                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
-                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
-                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
-                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
-                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
-                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 3.5, "w": 1.25},
-
-                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
-                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
-                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
-                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
-                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
-                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
-                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
-                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
-                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
-                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
-                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
-                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
-                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
-                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
-                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
-                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
-                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
-                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
-
-                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
-                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
-                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
-                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
-                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
-                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
-                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
-                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
-                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
-                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
-                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
-                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
-                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
-                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
-                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
-                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
-                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
-                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
-                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
-                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
-                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
-                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
-                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
-                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
-                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
-                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
-                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
-                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
-                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
-                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
-                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
-                {"label": "Backspace", "matrix": [7, 7], "x": 18.25, "y": 1.5, "w": 2},
-
-                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
-                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
-                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
-                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
-                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
-                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
-                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
-                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
-                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
-                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
-                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
-                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
-                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
-                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
-                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
-
-                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
-                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
-                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
-                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
-                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
-                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
-                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
-                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
-                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
-                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
-                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
-                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
-                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
-                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
-                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
-                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
-                {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
-
-                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
-                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
-                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
-                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
-                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
-                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
-                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
-                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
-                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
-                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
-                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
-                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
-                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
-                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
-                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
-                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
-                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
-                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
-                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
-                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
-                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
-                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
-                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
-                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
-                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
-                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
-                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
-            ]
-        },
-        "LAYOUT_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
-                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
-                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
-                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
-                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
-                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
-                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
-                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
-                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
-                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
-                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
-                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
-                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
-                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
-                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
-                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
-                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
-                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
-                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
-                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
-                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
-                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
-
-                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
-                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
-                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
-                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
-                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
-                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
-                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
-                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
-                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
-                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
-                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
-                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
-                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
-                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
-                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
-
-                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
-                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
-                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
-                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
-                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
-                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
-                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
-                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
-                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
-                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
-                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
-                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
-                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
-                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
-                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
-                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
-                {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
-
-                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
-                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
-                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
-                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
-                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
-                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
-                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
-                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
-                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
-                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
-                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
-                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
-                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
-                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
-                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
-                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
-                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
-
-                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
-                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
-                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
-                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
-                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
-                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
-                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
-                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
-                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
-                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
-                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
-                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
-                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
-                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
-                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
-                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
-                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
-                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
-                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
-                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
-                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
-                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
-                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
-                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
-                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
-                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
-                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
-                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
-                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
-                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
-                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
-                {"label": "Backspace", "matrix": [7, 7], "x": 19.25, "y": 1.5, "w": 2},
-
-                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
-                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
-                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
-                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
-                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
-                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
-                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
-                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
-                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
-                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
-                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
-                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
-                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
-                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
-                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-
-                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
-                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
-                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
-                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
-                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
-                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
-                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
-                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
-                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
-                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
-                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
-                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
-                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
-                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
-                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
-                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
-                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
-                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
-                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
-                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
-                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
-                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
-                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
-                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
-                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
-                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
-                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
-                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
-                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
-                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
-                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
-                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
-                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
-                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
-                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
-                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
-                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
-                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
-                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
-                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
-                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
-                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
-                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
-                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
-                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
-            ]
-        },
-        "LAYOUT_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
-                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
-                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
-                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
-                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
-                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
-                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
-                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
-                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
-                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
-                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
-                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
-                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
-                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
-                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
-                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
-                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
-                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
-                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
-                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
-                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
-                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
-
-                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
-                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
-                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
-                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
-                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
-                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
-                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
-                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
-                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
-                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
-                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
-                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
-                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
-                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
-                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-
-                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
-                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
-                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
-                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
-                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
-                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
-                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
-                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
-                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
-                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
-                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
-                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
-                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
-                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
-                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
-                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
-                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
-                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
-                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
-                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
-                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
-                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
-                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
-                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
-                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
-                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
-                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
-                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
-                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
-                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
-                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
-                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
-                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
-                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
-                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
-
-                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
-                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
-                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
-                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
-                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
-                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
-                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
-                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
-                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
-                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
-                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
-                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/viktus/sp111/keyboard.json b/keyboards/viktus/sp111/keyboard.json
new file mode 100644
index 00000000000..a309c14afe3
--- /dev/null
+++ b/keyboards/viktus/sp111/keyboard.json
@@ -0,0 +1,754 @@
+{
+    "keyboard_name": "SP111",
+    "manufacturer": "Viktus Design LLC",
+    "url": "https://thekey.company/products/sp-111",
+    "maintainer": "blindassassin111",
+    "usb": {
+        "vid": "0x5644",
+        "pid": "0x5111",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
+                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
+
+                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
+
+                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
+                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 3.5, "w": 1.25},
+
+                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"label": "Backspace", "matrix": [7, 7], "x": 18.25, "y": 1.5, "w": 2},
+
+                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
+
+                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+                {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
+
+                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
+                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
+
+                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
+
+                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+                {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
+
+                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"label": "Backspace", "matrix": [7, 7], "x": 19.25, "y": 1.5, "w": 2},
+
+                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+
+                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
+                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
+                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
+
+                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+
+                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
+                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/viktus/sp111/rules.mk b/keyboards/viktus/sp111/rules.mk
index 1be8c7ad68a..d9b01484992 100644
--- a/keyboards/viktus/sp111/rules.mk
+++ b/keyboards/viktus/sp111/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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes            # Smaller (and slightly faster) firmware
-
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json
deleted file mode 100644
index c6309422411..00000000000
--- a/keyboards/viktus/sp_mini/info.json
+++ /dev/null
@@ -1,686 +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": {
-        "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/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 e3c4a42def8..00000000000
--- a/keyboards/viktus/sp_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 = 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
diff --git a/keyboards/viktus/styrka_topre/info.json b/keyboards/viktus/styrka_topre/keyboard.json
similarity index 100%
rename from keyboards/viktus/styrka_topre/info.json
rename to keyboards/viktus/styrka_topre/keyboard.json
diff --git a/keyboards/vinhcatba/uncertainty/info.json b/keyboards/vinhcatba/uncertainty/keyboard.json
similarity index 100%
rename from keyboards/vinhcatba/uncertainty/info.json
rename to keyboards/vinhcatba/uncertainty/keyboard.json
diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/keyboard.json
similarity index 100%
rename from keyboards/vitamins_included/rev1/info.json
rename to keyboards/vitamins_included/rev1/keyboard.json
diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk
deleted file mode 100644
index 3bbd2614291..00000000000
--- a/keyboards/vitamins_included/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/keyboard.json
similarity index 100%
rename from keyboards/vitamins_included/rev2/info.json
rename to keyboards/vitamins_included/rev2/keyboard.json
diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json
deleted file mode 100644
index 92b4add8ea2..00000000000
--- a/keyboards/waterfowl/info.json
+++ /dev/null
@@ -1,87 +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": {
-        "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/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 afab74111f8..00000000000
--- a/keyboards/waterfowl/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
-
-OLED_ENABLE = yes        # Enables the use of OLED displays
-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 a7751b1d064..00000000000
--- a/keyboards/whale/sk/v3/info.json
+++ /dev/null
@@ -1,236 +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",
-    "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/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 ab2c49da70e..00000000000
--- a/keyboards/whale/sk/v3/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 = 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/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/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/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/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/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 ed56ff2b3ad..00000000000
--- a/keyboards/wren/info.json
+++ /dev/null
@@ -1,147 +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": {
-        "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/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 088c390ec80..00000000000
--- a/keyboards/wren/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
-ENCODER_ENABLE = yes        # Enables the use of one or more encoders
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/zsa/voyager/config.h b/keyboards/zsa/voyager/config.h
new file mode 100644
index 00000000000..630c01fc809
--- /dev/null
+++ b/keyboards/zsa/voyager/config.h
@@ -0,0 +1,14 @@
+// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
+
+#define IS31FL3731_I2C_TIMEOUT 5
+
+#define MOUSEKEY_WHEEL_INTERVAL MOUSEKEY_INTERVAL
+#define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX
diff --git a/keyboards/zsa/voyager/halconf.h b/keyboards/zsa/voyager/halconf.h
new file mode 100644
index 00000000000..d9f29a11cb1
--- /dev/null
+++ b/keyboards/zsa/voyager/halconf.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 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 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/zsa/voyager/info.json b/keyboards/zsa/voyager/info.json
new file mode 100644
index 00000000000..14e7584f5cc
--- /dev/null
+++ b/keyboards/zsa/voyager/info.json
@@ -0,0 +1,219 @@
+{
+    "manufacturer": "ZSA Technology Labs",
+    "keyboard_name": "Voyager",
+    "maintainer": "ZSA Technology Labs",
+    "url": "zsa.io/voyager",
+    "processor": "STM32F303",
+    "bootloader": "custom",
+    "usb": {
+        "vid": "0x3297",
+        "pid": "0x1977",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "mouse": false
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "caps_word": true,
+        "deferred_exec": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "swap_hands": true,
+        "rgb_matrix": true
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "cols": 7,
+        "rows": 12
+    },
+    "mousekey": {
+        "delay": 0,
+        "interval": 20,
+        "max_speed": 7,
+        "time_to_max": 60,
+        "wheel_delay": 400
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgb_matrix": {
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 5,
+        "max_brightness": 175,
+        "sleep": true,
+        "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,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "flower_blooming": 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,
+            "starlight": true,
+            "starlight_dual_sat": true,
+            "starlight_dual_hue": true,
+            "riverflow": true
+        },
+        "layout": [
+            {"matrix": [0, 1], "x": 0, "y": 10, "flags": 1},
+            {"matrix": [0, 2], "x": 17, "y": 10, "flags": 4},
+            {"matrix": [0, 3], "x": 34, "y": 8, "flags": 4},
+            {"matrix": [0, 4], "x": 52, "y": 5, "flags": 4},
+            {"matrix": [0, 5], "x": 69, "y": 8, "flags": 4},
+            {"matrix": [0, 6], "x": 86, "y": 10, "flags": 4},
+            {"matrix": [1, 1], "x": 0, "y": 21, "flags": 1},
+            {"matrix": [1, 2], "x": 17, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 34, "y": 19, "flags": 4},
+            {"matrix": [1, 4], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 5], "x": 69, "y": 19, "flags": 4},
+            {"matrix": [1, 6], "x": 86, "y": 21, "flags": 4},
+            {"matrix": [2, 1], "x": 0, "y": 32, "flags": 1},
+            {"matrix": [2, 2], "x": 17, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 34, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 52, "y": 28, "flags": 4},
+            {"matrix": [2, 5], "x": 69, "y": 30, "flags": 4},
+            {"matrix": [2, 6], "x": 86, "y": 32, "flags": 4},
+            {"matrix": [3, 1], "x": 0, "y": 43, "flags": 1},
+            {"matrix": [3, 2], "x": 17, "y": 43, "flags": 4},
+            {"matrix": [3, 3], "x": 34, "y": 41, "flags": 4},
+            {"matrix": [3, 4], "x": 52, "y": 39, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 41, "flags": 4},
+            {"matrix": [4, 4], "x": 86, "y": 43, "flags": 4},
+            {"matrix": [5, 0], "x": 86, "y": 53, "flags": 1},
+            {"matrix": [5, 1], "x": 96, "y": 58, "flags": 1},
+            {"matrix": [6, 0], "x": 138, "y": 10, "flags": 4},
+            {"matrix": [6, 1], "x": 155, "y": 10, "flags": 4},
+            {"matrix": [6, 2], "x": 172, "y": 8, "flags": 4},
+            {"matrix": [6, 3], "x": 190, "y": 5, "flags": 4},
+            {"matrix": [6, 4], "x": 207, "y": 8, "flags": 4},
+            {"matrix": [6, 5], "x": 224, "y": 10, "flags": 1},
+            {"matrix": [7, 0], "x": 138, "y": 21, "flags": 4},
+            {"matrix": [7, 1], "x": 155, "y": 21, "flags": 4},
+            {"matrix": [7, 2], "x": 172, "y": 19, "flags": 4},
+            {"matrix": [7, 3], "x": 190, "y": 17, "flags": 4},
+            {"matrix": [7, 4], "x": 207, "y": 19, "flags": 4},
+            {"matrix": [7, 5], "x": 224, "y": 21, "flags": 1},
+            {"matrix": [8, 0], "x": 138, "y": 32, "flags": 4},
+            {"matrix": [8, 1], "x": 155, "y": 32, "flags": 4},
+            {"matrix": [8, 2], "x": 172, "y": 30, "flags": 4},
+            {"matrix": [8, 3], "x": 190, "y": 28, "flags": 4},
+            {"matrix": [8, 4], "x": 207, "y": 30, "flags": 4},
+            {"matrix": [8, 5], "x": 224, "y": 32, "flags": 1},
+            {"matrix": [10, 2], "x": 138, "y": 43, "flags": 4},
+            {"matrix": [9, 1], "x": 155, "y": 43, "flags": 4},
+            {"matrix": [9, 2], "x": 172, "y": 41, "flags": 4},
+            {"matrix": [9, 3], "x": 190, "y": 39, "flags": 4},
+            {"matrix": [9, 4], "x": 207, "y": 41, "flags": 4},
+            {"matrix": [9, 5], "x": 224, "y": 43, "flags": 1},
+            {"matrix": [11, 5], "x": 128, "y": 58, "flags": 1},
+            {"matrix": [11, 6], "x": 138, "y": 53, "flags": 1}
+        ]
+    },
+    "layout_aliases": {
+        "LAYOUT_voyager": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k00", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "k01", "matrix": [0, 2], "x": 12, "y": 0},
+                {"label": "k02", "matrix": [0, 3], "x": 2, "y": 0.25},
+                {"label": "k03", "matrix": [0, 4], "x": 4, "y": 0.25},
+                {"label": "k04", "matrix": [0, 5], "x": 11, "y": 0.25},
+                {"label": "k05", "matrix": [0, 6], "x": 13, "y": 0.25},
+                {"label": "k26", "matrix": [6, 0], "x": 0, "y": 0.5},
+                {"label": "k27", "matrix": [6, 1], "x": 1, "y": 0.5},
+                {"label": "k28", "matrix": [6, 2], "x": 5, "y": 0.5},
+                {"label": "k29", "matrix": [6, 3], "x": 10, "y": 0.5},
+                {"label": "k30", "matrix": [6, 4], "x": 14, "y": 0.5},
+                {"label": "k31", "matrix": [6, 5], "x": 15, "y": 0.5},
+                {"label": "k06", "matrix": [1, 1], "x": 3, "y": 1},
+                {"label": "k07", "matrix": [1, 2], "x": 12, "y": 1},
+                {"label": "k08", "matrix": [1, 3], "x": 2, "y": 1.25},
+                {"label": "k09", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "k10", "matrix": [1, 5], "x": 11, "y": 1.25},
+                {"label": "k11", "matrix": [1, 6], "x": 13, "y": 1.25},
+                {"label": "k32", "matrix": [7, 0], "x": 0, "y": 1.5},
+                {"label": "k33", "matrix": [7, 1], "x": 1, "y": 1.5},
+                {"label": "k34", "matrix": [7, 2], "x": 5, "y": 1.5},
+                {"label": "k35", "matrix": [7, 3], "x": 10, "y": 1.5},
+                {"label": "k36", "matrix": [7, 4], "x": 14, "y": 1.5},
+                {"label": "k37", "matrix": [7, 5], "x": 15, "y": 1.5},
+                {"label": "k12", "matrix": [2, 1], "x": 3, "y": 2},
+                {"label": "k13", "matrix": [2, 2], "x": 12, "y": 2},
+                {"label": "k14", "matrix": [2, 3], "x": 2, "y": 2.25},
+                {"label": "k15", "matrix": [2, 4], "x": 4, "y": 2.25},
+                {"label": "k16", "matrix": [2, 5], "x": 11, "y": 2.25},
+                {"label": "k17", "matrix": [2, 6], "x": 13, "y": 2.25},
+                {"label": "k38", "matrix": [8, 0], "x": 0, "y": 2.5},
+                {"label": "k39", "matrix": [8, 1], "x": 1, "y": 2.5},
+                {"label": "k40", "matrix": [8, 2], "x": 5, "y": 2.5},
+                {"label": "k41", "matrix": [8, 3], "x": 10, "y": 2.5},
+                {"label": "k42", "matrix": [8, 4], "x": 14, "y": 2.5},
+                {"label": "k43", "matrix": [8, 5], "x": 15, "y": 2.5},
+                {"label": "k18", "matrix": [3, 1], "x": 3, "y": 3},
+                {"label": "k19", "matrix": [3, 2], "x": 12, "y": 3},
+                {"label": "k20", "matrix": [3, 3], "x": 2, "y": 3.25},
+                {"label": "k21", "matrix": [3, 4], "x": 4, "y": 3.25},
+                {"label": "k22", "matrix": [3, 5], "x": 11, "y": 3.25},
+                {"label": "k23", "matrix": [4, 4], "x": 13, "y": 3.25},
+                {"label": "k44", "matrix": [10, 2], "x": 0, "y": 3.5},
+                {"label": "k45", "matrix": [9, 1], "x": 1, "y": 3.5},
+                {"label": "k46", "matrix": [9, 2], "x": 5, "y": 3.5},
+                {"label": "k47", "matrix": [9, 3], "x": 10, "y": 3.5},
+                {"label": "k48", "matrix": [9, 4], "x": 14, "y": 3.5},
+                {"label": "k49", "matrix": [9, 5], "x": 15, "y": 3.5},
+                {"label": "k24", "matrix": [5, 0], "x": 5, "y": 4.5},
+                {"label": "k25", "matrix": [5, 1], "x": 6, "y": 4.75},
+                {"label": "k50", "matrix": [11, 5], "x": 9, "y": 4.75},
+                {"label": "k51", "matrix": [11, 6], "x": 10, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/zsa/voyager/keymaps/default/keymap.c b/keyboards/zsa/voyager/keymaps/default/keymap.c
new file mode 100644
index 00000000000..e05794de756
--- /dev/null
+++ b/keyboards/zsa/voyager/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// 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_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+        CW_TOGG, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        SFT_T(KC_BSPC),KC_A, KC_S, KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, RSFT_T(KC_QUOT),
+        KC_LGUI, ALT_T(KC_Z),KC_X, KC_C,    KC_V,    KC_B,                         KC_N,    KC_M,    KC_COMMA,KC_DOT,  RALT_T(KC_SLSH), KC_RCTL,
+                                LT(1,KC_ENT), CTL_T(KC_TAB),           SFT_T(KC_BSPC), LT(2,KC_SPC)
+    ),
+    [1] = 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_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                      KC_7,    KC_8,    KC_9,    KC_MINS, KC_SLSH, KC_F12,
+        _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,                      KC_4,    KC_5,    KC_6,    KC_PLUS, KC_ASTR, KC_BSPC,
+        _______, _______, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR,                      KC_1,    KC_2,    KC_3,    KC_DOT,  KC_EQL,  KC_ENT,
+                                                     _______, _______,    _______, KC_0
+    ),
+    [2] = LAYOUT(
+        RGB_TOG, QK_KB,   RGB_MOD, RGB_M_P, RGB_VAD, RGB_VAI,                      _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,                      KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, _______,
+        _______, KC_MPRV, KC_MNXT, KC_MSTP, KC_MPLY, _______,                      KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+        _______, _______, _______, _______, _______, _______,                      _______, C(S(KC_TAB)), C(KC_TAB), _______, _______, _______,
+                                                     _______, _______,    _______, _______
+    ),
+};
diff --git a/keyboards/zsa/voyager/ld/voyager.ld b/keyboards/zsa/voyager/ld/voyager.ld
new file mode 100644
index 00000000000..0619983beb0
--- /dev/null
+++ b/keyboards/zsa/voyager/ld/voyager.ld
@@ -0,0 +1,85 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * STM32F303xC memory setup.
+ */
+MEMORY
+{
+    flash0 (rx) : org = 0x08002000, len = 256k - 0x2000
+    flash1 (rx) : org = 0x00000000, len = 0
+    flash2 (rx) : org = 0x00000000, len = 0
+    flash3 (rx) : org = 0x00000000, len = 0
+    flash4 (rx) : org = 0x00000000, len = 0
+    flash5 (rx) : org = 0x00000000, len = 0
+    flash6 (rx) : org = 0x00000000, len = 0
+    flash7 (rx) : org = 0x00000000, len = 0
+    ram0   (wx) : org = 0x20000000, len = 40k
+    ram1   (wx) : org = 0x00000000, len = 0
+    ram2   (wx) : org = 0x00000000, len = 0
+    ram3   (wx) : org = 0x00000000, len = 0
+    ram4   (wx) : org = 0x10000000, len = 8k
+    ram5   (wx) : org = 0x00000000, len = 0
+    ram6   (wx) : org = 0x00000000, len = 0
+    ram7   (wx) : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
\ No newline at end of file
diff --git a/keyboards/zsa/voyager/matrix.c b/keyboards/zsa/voyager/matrix.c
new file mode 100644
index 00000000000..614c3ffa041
--- /dev/null
+++ b/keyboards/zsa/voyager/matrix.c
@@ -0,0 +1,204 @@
+// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <stdint.h>
+#include "voyager.h"
+#include "mcp23018.h"
+
+#pragma GCC push_options
+#pragma GCC optimize("-O3")
+
+extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
+extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
+static matrix_row_t raw_matrix_right[MATRIX_COLS];
+
+#define MCP_ROWS_PER_HAND (MATRIX_ROWS / 2)
+#ifndef VOYAGER_I2C_TIMEOUT
+#    define VOYAGER_I2C_TIMEOUT 100
+#endif
+// Delay between each i2c io expander ops (in MCU cycles)
+#ifndef IO_EXPANDER_OP_DELAY
+#    define IO_EXPANDER_OP_DELAY 500
+#endif
+
+extern bool mcp23018_leds[2];
+extern bool is_launching;
+
+static uint16_t mcp23018_reset_loop;
+uint8_t         mcp23018_errors;
+
+bool io_expander_ready(void) {
+    uint8_t tx;
+    return mcp23018_readPins(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, &tx);
+}
+
+void matrix_init_custom(void) {
+    // outputs
+    gpio_set_pin_output(B10);
+    gpio_set_pin_output(B11);
+    gpio_set_pin_output(B12);
+    gpio_set_pin_output(B13);
+    gpio_set_pin_output(B14);
+    gpio_set_pin_output(B15);
+
+    // inputs
+    gpio_set_pin_input_low(A0);
+    gpio_set_pin_input_low(A1);
+    gpio_set_pin_input_low(A2);
+    gpio_set_pin_input_low(A3);
+    gpio_set_pin_input_low(A6);
+    gpio_set_pin_input_low(A7);
+    gpio_set_pin_input_low(B0);
+
+    mcp23018_init(MCP23018_DEFAULT_ADDRESS);
+    mcp23018_errors += !mcp23018_set_config(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, 0b00000000);
+    mcp23018_errors += !mcp23018_set_config(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, 0b00111111);
+
+    if (!mcp23018_errors) {
+        is_launching = true;
+    }
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+    // Attempt to reset the mcp23018 if it's not initialized
+    if (mcp23018_errors) {
+        if (++mcp23018_reset_loop > 0x1FFF) {
+            if (io_expander_ready()) {
+                // If we managed to initialize the mcp23018 - we need to reinitialize the matrix / layer state. During an electric discharge the i2c peripherals might be in a weird state. Giving a delay and resetting the MCU allows to recover from this.
+                wait_ms(200);
+                mcu_reset();
+            }
+        }
+    }
+
+    // Scanning left and right side of the keyboard for key presses.
+    // Left side is scanned by reading the gpio pins directly, right side is scanned by reading the mcp23018 registers.
+
+    matrix_row_t data = 0;
+    for (uint8_t row = 0; row <= MCP_ROWS_PER_HAND; row++) {
+        // strobe row
+        switch (row) {
+            case 0:
+                gpio_write_pin_high(B10);
+                break;
+            case 1:
+                gpio_write_pin_high(B11);
+                break;
+            case 2:
+                gpio_write_pin_high(B12);
+                break;
+            case 3:
+                gpio_write_pin_high(B13);
+                break;
+            case 4:
+                gpio_write_pin_high(B14);
+                break;
+            case 5:
+                gpio_write_pin_high(B15);
+                break;
+            case 6:
+                break; // Left hand has 6 rows
+        }
+
+        // Selecting the row on the right side of the keyboard.
+        if (!mcp23018_errors) {
+            // select row
+            mcp23018_errors += !mcp23018_set_output(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, 0b01111111 & ~(1 << (row)));
+            mcp23018_errors += !mcp23018_set_output(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, ((uint8_t)!mcp23018_leds[1] << 6) | ((uint8_t)!mcp23018_leds[0] << 7));
+        }
+        // Reading the left side of the keyboard.
+        if (row < MCP_ROWS_PER_HAND) {
+            // i2c comm incur enough wait time
+            if (mcp23018_errors) {
+                // need wait to settle pin state
+                matrix_io_delay();
+            }
+            // read col data
+            data = ((readPin(A0) << 0) | (readPin(A1) << 1) | (readPin(A2) << 2) | (readPin(A3) << 3) | (readPin(A6) << 4) | (readPin(A7) << 5) | (readPin(B0) << 6));
+            // unstrobe  row
+            switch (row) {
+                case 0:
+                    gpio_write_pin_low(B10);
+                    break;
+                case 1:
+                    gpio_write_pin_low(B11);
+                    break;
+                case 2:
+                    gpio_write_pin_low(B12);
+                    break;
+                case 3:
+                    gpio_write_pin_low(B13);
+                    break;
+                case 4:
+                    gpio_write_pin_low(B14);
+                    break;
+                case 5:
+                    gpio_write_pin_low(B15);
+                    break;
+                case 6:
+                    break;
+            }
+
+            if (current_matrix[row] != data) {
+                current_matrix[row] = data;
+                changed             = true;
+            }
+        }
+
+        // Reading the right side of the keyboard.
+        if (!mcp23018_errors) {
+            for (uint16_t i = 0; i < IO_EXPANDER_OP_DELAY; i++) {
+                __asm__("nop");
+            }
+            uint8_t rx;
+            mcp23018_errors += !mcp23018_readPins(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, &rx);
+            data = ~(rx & 0b00111111);
+            for (uint16_t i = 0; i < IO_EXPANDER_OP_DELAY; i++) {
+                __asm__("nop");
+            }
+        } else {
+            data = 0;
+        }
+
+        if (raw_matrix_right[row] != data) {
+            raw_matrix_right[row] = data;
+            changed               = true;
+        }
+    }
+
+    for (uint8_t row = 0; row < MCP_ROWS_PER_HAND; row++) {
+        current_matrix[11 - row] = 0;
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            current_matrix[11 - row] |= ((raw_matrix_right[6 - col] & (1 << row) ? 1 : 0) << col);
+        }
+    }
+    return changed;
+}
+
+// DO NOT REMOVE
+// Needed for proper wake/sleep
+void matrix_power_up(void) {
+    bool temp_launching = is_launching;
+
+    matrix_init_custom();
+
+    is_launching = temp_launching;
+    if (!temp_launching) {
+        STATUS_LED_1(false);
+        STATUS_LED_2(false);
+        STATUS_LED_3(false);
+        STATUS_LED_4(false);
+    }
+
+    // initialize matrix state: all keys off
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+    }
+}
+
+bool is_transport_connected(void) {
+    return (bool)(mcp23018_errors == 0);
+}
+#pragma GCC pop_options
diff --git a/keyboards/zsa/voyager/mcuconf.h b/keyboards/zsa/voyager/mcuconf.h
new file mode 100644
index 00000000000..f75edce3e9b
--- /dev/null
+++ b/keyboards/zsa/voyager/mcuconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 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 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 <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+// for i2c expander, and ISSI
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/zsa/voyager/readme.md b/keyboards/zsa/voyager/readme.md
new file mode 100644
index 00000000000..4a602ee1374
--- /dev/null
+++ b/keyboards/zsa/voyager/readme.md
@@ -0,0 +1,40 @@
+# Voyager
+
+A next-gen split, ergonomic keyboard with an active left side, USB type C, and low profile switches.
+
+* Keyboard Maintainer: [drashna](https://github.com/drashna), [ZSA](https://github.com/zsa/)
+* Hardware Supported: Voyager (STM32F303xC)
+* Hardware Availability: [ZSA Store](https://zsa.io/voyager/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zsa/voyager:default
+
+Flashing example for this keyboard:
+
+    make zsa/voyager: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).
+
+
+## Voyager Customization
+
+### Indicator LEDs
+
+There are 4 functions for enabling and disabling the LEDs on the top of the boards. The functions are `STATUS_LED_1(bool)` through `STATUS_LED_4(bool)`, with the first LED being the top most LED on the left hand, and the fourth LED being the bottom most LED on the right side.
+
+By default, the Indicator LEDs are used to indicate the layer state for the keyboard.  If you wish to change this (and indicate caps/num/scroll lock status instead), then define `VOYAGER_USER_LEDS` in your `config.h` file.
+
+### Detecting split / Gaming mode
+
+To make it extra gaming friendly, you can configure what happens when you disconnect the right half. This is especially useful when using gaming unfriendly layers or layouts (e.g. home row mods, dvorak, colemak).
+
+Example for enabling a specific layer while right side is disconnected:
+
+```c
+void housekeeping_task_user(void) {
+    if (!is_transport_connected()) {
+        // set layer
+    }
+}
+```
diff --git a/keyboards/zsa/voyager/rules.mk b/keyboards/zsa/voyager/rules.mk
new file mode 100644
index 00000000000..bb95224d2bf
--- /dev/null
+++ b/keyboards/zsa/voyager/rules.mk
@@ -0,0 +1,10 @@
+MCU_LDSCRIPT = voyager
+
+CUSTOM_MATRIX = lite
+PROGRAM_CMD = $(call EXEC_DFU)
+DFU_ARGS = -d 3297:0791 -a 0 -s 0x08002000:leave
+DFU_SUFFIX_ARGS = -v 3297 -p 0791
+
+VPATH += drivers/gpio
+SRC += matrix.c mcp23018.c
+I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/zsa/voyager/voyager.c b/keyboards/zsa/voyager/voyager.c
new file mode 100644
index 00000000000..d70f1be3eff
--- /dev/null
+++ b/keyboards/zsa/voyager/voyager.c
@@ -0,0 +1,312 @@
+// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "voyager.h"
+
+keyboard_config_t keyboard_config;
+
+bool mcp23018_leds[2] = {0, 0};
+bool is_launching     = false;
+
+#if defined(DEFERRED_EXEC_ENABLE)
+#    if defined(DYNAMIC_MACRO_ENABLE)
+deferred_token dynamic_macro_token = INVALID_DEFERRED_TOKEN;
+
+static uint32_t dynamic_macro_led(uint32_t trigger_time, void *cb_arg) {
+    static bool led_state = true;
+    if (!is_launching) {
+        led_state = !led_state;
+        STATUS_LED_3(led_state);
+    }
+    return 100;
+}
+
+void dynamic_macro_record_start_user(void) {
+    if (my_token == INVALID_DEFERRED_TOKEN) {
+        STATUS_LED_3(true);
+        dynamic_macro_token = defer_exec(100, dynamic_macro_led, NULL);
+    }
+}
+
+void dynamic_macro_record_end_user(int8_t direction) {
+    if (cancel_deferred_exec(dynamic_macro_token)) {
+        dynamic_macro_token = INVALID_DEFERRED_TOKEN;
+        STATUS_LED_3(false);
+    }
+}
+#    endif
+
+static uint32_t startup_exec(uint32_t trigger_time, void *cb_arg) {
+    static uint8_t startup_loop = 0;
+
+    switch (startup_loop++) {
+        case 0:
+            STATUS_LED_1(true);
+            STATUS_LED_2(false);
+            STATUS_LED_3(false);
+            STATUS_LED_4(false);
+            break;
+        case 1:
+            STATUS_LED_2(true);
+            break;
+        case 2:
+            STATUS_LED_3(true);
+            break;
+        case 3:
+            STATUS_LED_4(true);
+            break;
+        case 4:
+            STATUS_LED_1(false);
+            break;
+        case 5:
+            STATUS_LED_2(false);
+            break;
+        case 6:
+            STATUS_LED_3(false);
+            break;
+        case 7:
+            STATUS_LED_4(false);
+            break;
+        case 8:
+            is_launching = false;
+            layer_state_set_kb(layer_state);
+            return 0;
+    }
+    return 250;
+}
+#endif
+
+void keyboard_pre_init_kb(void) {
+    // Initialize Reset pins
+    gpio_set_pin_input(A8);
+    gpio_set_pin_output(A9);
+    gpio_write_pin_low(A9);
+
+    gpio_set_pin_output(B5);
+    gpio_set_pin_output(B4);
+    gpio_set_pin_output(B3);
+
+    gpio_write_pin_low(B5);
+    gpio_write_pin_low(B4);
+    gpio_write_pin_low(B3);
+
+    keyboard_pre_init_user();
+}
+
+#if !defined(VOYAGER_USER_LEDS)
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    state = layer_state_set_user(state);
+    if (is_launching || !keyboard_config.led_level) return state;
+
+    uint8_t layer = get_highest_layer(state);
+
+    STATUS_LED_1(layer & (1 << 0));
+    STATUS_LED_2(layer & (1 << 1));
+    STATUS_LED_3(layer & (1 << 2));
+
+#    if !defined(CAPS_LOCK_STATUS)
+    STATUS_LED_4(layer & (1 << 3));
+#    endif
+    return state;
+}
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |      G location
+ *   |  |      |      B location
+ *   |  |      |      | */
+    {0, C2_2,  C1_2,  C4_3},
+    {0, C2_3,  C1_3,  C3_3},
+    {0, C2_4,  C1_4,  C3_4},
+    {0, C2_5,  C1_5,  C3_5},
+    {0, C2_6,  C1_6,  C3_6},
+    {0, C2_7,  C1_7,  C3_7},
+    {0, C2_8,  C1_8,  C3_8},
+    {0, C8_1,  C7_1,  C9_1},
+    {0, C8_2,  C7_2,  C9_2},
+    {0, C8_3,  C7_3,  C9_3},
+    {0, C8_4,  C7_4,  C9_4},
+    {0, C8_5,  C7_5,  C9_5},
+    {0, C8_6,  C7_6,  C9_6},
+    {0, C2_10,  C1_10,  C4_11},
+    {0, C2_11,  C1_11,  C3_11},
+    {0, C2_12,  C1_12,  C3_12},
+    {0, C2_13,  C1_13,  C3_13},
+    {0, C2_14,  C1_14,  C3_14},
+    {0, C2_15,  C1_15,  C3_15},
+    {0, C2_16,  C1_16,  C3_16},
+    {0, C8_9,  C7_9,  C9_9},
+    {0, C8_10,  C7_10,  C9_10},
+    {0, C8_11,  C7_11,  C9_11},
+    {0, C8_12,  C7_12,  C9_12},
+    {0, C8_13,  C7_13,  C9_13},
+    {0, C8_14,  C7_14,  C9_14},
+
+    {1, C2_7,  C1_7,  C3_7},
+    {1, C2_6,  C1_6,  C3_6},
+    {1, C2_5,  C1_5,  C3_5},
+    {1, C2_4,  C1_4,  C3_4},
+    {1, C2_3,  C1_3,  C3_3},
+    {1, C2_2,  C1_2,  C4_3},
+
+    {1, C8_5,  C7_5,  C9_5},
+    {1, C8_4,  C7_4,  C9_4},
+    {1, C8_3,  C7_3,  C9_3},
+    {1, C8_2,  C7_2,  C9_2},
+    {1, C8_1,  C7_1,  C9_1},
+    {1, C2_8,  C1_8,  C3_8},
+
+    {1, C2_14,  C1_14,  C3_14},
+    {1, C2_13,  C1_13,  C3_13},
+    {1, C2_12,  C1_12,  C3_12},
+    {1, C2_11,  C1_11,  C3_11},
+    {1, C2_10,  C1_10,  C4_11},
+    {1, C8_6,  C7_6,  C9_6},
+
+    {1, C8_12,  C7_12,  C9_12},
+    {1, C8_11,  C7_11,  C9_11},
+    {1, C8_10,  C7_10,  C9_10},
+    {1, C8_9,  C7_9,  C9_9},
+    {1, C2_16,  C1_16,  C3_16},
+    {1, C2_15,  C1_15,  C3_15},
+
+    {1, C8_14,  C7_14,  C9_14},
+    {1, C8_13,  C7_13,  C9_13},
+};
+// clang-format on
+#endif
+
+#ifdef SWAP_HANDS_ENABLE
+// swap-hands action needs a matrix to define the swap
+// clang-format off
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    /* Left hand, matrix positions */
+    {{6,6}, {5,6}, {4,6}, {3,6}, {2,6}, {1,6},{0,6}},
+    {{6,7}, {5,7}, {4,7}, {3,7}, {2,7}, {1,7},{0,7}},
+    {{6,8}, {5,8}, {4,8}, {3,8}, {2,8}, {1,8},{0,8}},
+    {{6,9}, {5,9}, {4,9}, {3,9}, {2,9}, {1,9},{0,9}},
+    {{6,10},{5,10},{4,10},{3,10},{2,10},{1,10},{0,10}},
+    {{6,11},{5,11},{4,11},{3,11},{2,11},{1,11},{0,11}},
+    /* Right hand, matrix positions */
+    {{6,0}, {5,0}, {4,0}, {3,0}, {2,0}, {1,0},{0,0}},
+    {{6,1}, {5,1}, {4,1}, {3,1}, {2,1}, {1,1},{0,1}},
+    {{6,2}, {5,2}, {4,2}, {3,2}, {2,2}, {1,2},{0,2}},
+    {{6,3}, {5,3}, {4,3}, {3,3}, {2,3}, {1,3},{0,3}},
+    {{6,4}, {5,4}, {4,4}, {3,4}, {2,4}, {1,4},{0,4}},
+    {{6,5}, {5,5}, {4,5}, {3,5}, {2,5}, {1,5},{0,5}},
+};
+// clang-format on
+#endif
+
+#ifdef CAPS_LOCK_STATUS
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        STATUS_LED_4(led_state.caps_lock);
+    }
+    return res;
+}
+#endif
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+#if !defined(VOYAGER_USER_LEDS)
+        case LED_LEVEL:
+            if (record->event.pressed) {
+                keyboard_config.led_level ^= 1;
+                eeconfig_update_kb(keyboard_config.raw);
+                if (keyboard_config.led_level) {
+                    layer_state_set_kb(layer_state);
+                } else {
+                    STATUS_LED_1(false);
+                    STATUS_LED_2(false);
+                    STATUS_LED_3(false);
+                    STATUS_LED_4(false);
+                }
+            }
+            break;
+#endif
+#ifdef RGB_MATRIX_ENABLE
+        case TOGGLE_LAYER_COLOR:
+            if (record->event.pressed) {
+                keyboard_config.disable_layer_led ^= 1;
+                if (keyboard_config.disable_layer_led) rgb_matrix_set_color_all(0, 0, 0);
+            }
+            break;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            return false;
+#endif
+    }
+    return true;
+}
+
+void keyboard_post_init_kb(void) {
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_enable_noeeprom();
+#endif
+
+    keyboard_config.raw = eeconfig_read_kb();
+
+    if (!keyboard_config.led_level && !keyboard_config.led_level_res) {
+        keyboard_config.led_level     = true;
+        keyboard_config.led_level_res = 0b11;
+        eeconfig_update_kb(keyboard_config.raw);
+    }
+#if defined(DEFERRED_EXEC_ENABLE)
+    is_launching = true;
+    defer_exec(500, startup_exec, NULL);
+#endif
+    keyboard_post_init_user();
+}
+
+void eeconfig_init_kb(void) { // EEPROM is getting reset!
+    keyboard_config.raw           = 0;
+    keyboard_config.led_level     = true;
+    keyboard_config.led_level_res = 0b11;
+    eeconfig_update_kb(keyboard_config.raw);
+    eeconfig_init_user();
+}
+
+__attribute__((weak)) void bootloader_jump(void) {
+    // The ignition bootloader is checking for a high signal on A8 for 100ms when powering on the board.
+    // Setting both A8 and A9 high will charge the capacitor quickly.
+    // Setting A9 low before reset will cause the capacitor to discharge
+    // thus making the bootloder unlikely to trigger twice between power cycles.
+    gpio_set_pin_output_push_pull(A9);
+    gpio_set_pin_output_push_pull(A8);
+    gpio_write_pin_high(A9);
+    gpio_write_pin_high(A8);
+    wait_ms(500);
+    gpio_write_pin_low(A9);
+
+    NVIC_SystemReset();
+}
+
+__attribute__((weak)) void mcu_reset(void) {
+    gpio_set_pin_output_push_pull(A9);
+    gpio_set_pin_output_push_pull(A8);
+    gpio_write_pin_low(A8);
+    gpio_write_pin_low(A9);
+
+    NVIC_SystemReset();
+}
diff --git a/keyboards/zsa/voyager/voyager.h b/keyboards/zsa/voyager/voyager.h
new file mode 100644
index 00000000000..a00cc995c62
--- /dev/null
+++ b/keyboards/zsa/voyager/voyager.h
@@ -0,0 +1,35 @@
+// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+extern bool mcp23018_leds[];
+
+#define MCP23018_DEFAULT_ADDRESS 0b0100000
+
+#define STATUS_LED_1(status) gpio_write_pin(B5, (bool)(status))
+#define STATUS_LED_2(status) gpio_write_pin(B4, (bool)(status))
+#define STATUS_LED_3(status) mcp23018_leds[0] = (bool)(status)
+#define STATUS_LED_4(status) mcp23018_leds[1] = (bool)(status)
+
+enum voyager_keycodes {
+    TOGGLE_LAYER_COLOR = QK_KB,
+    LED_LEVEL,
+};
+
+typedef union {
+    uint32_t raw;
+    struct {
+        bool    disable_layer_led : 1;
+        bool    placeholder : 1;
+        bool    led_level : 1;
+        uint8_t led_level_res : 2; // DO NOT REMOVE
+    };
+} keyboard_config_t;
+
+extern keyboard_config_t keyboard_config;
+
+bool is_transport_connected(void);
diff --git a/quantum/process_keycode/process_led_matrix.c b/quantum/process_keycode/process_led_matrix.c
index 217c9a2c28a..7f95bf10115 100644
--- a/quantum/process_keycode/process_led_matrix.c
+++ b/quantum/process_keycode/process_led_matrix.c
@@ -7,24 +7,39 @@
 bool process_led_matrix(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         switch (keycode) {
-            case QK_BACKLIGHT_ON:
+            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_DOWN:
-                led_matrix_decrease_val();
-                return false;
-            case QK_BACKLIGHT_UP:
-                led_matrix_increase_val();
-                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;
         }
     }