Miscellaneous keyboard.json migrations (#23486) - qmk_firmware

commit: 2eea2cdc46b3e920578ed75c4545a8b5160135bd
parent 8ad3a36fb60d75b5f0279f0cd4d9c24dde6b6330
Author: Joel Challis <git@zvecr.com>
Date:   Sat, 13 Apr 2024 08:45:27 +0100

Miscellaneous keyboard.json migrations (#23486)


Diffstat:
D keyboards/bastardkb/tbk/info.json 102 -------------------------------------------------------------------------------
A keyboards/bastardkb/tbk/keyboard.json 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/bastardkb/tbk/rules.mk 12 ------------
D keyboards/flxlb/zplit/info.json 104 -------------------------------------------------------------------------------
A keyboards/flxlb/zplit/keyboard.json 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/flxlb/zplit/rules.mk 13 -------------
D keyboards/fungo/rev1/info.json 130 -------------------------------------------------------------------------------
A keyboards/fungo/rev1/keyboard.json 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/fungo/rev1/rules.mk 15 ---------------
D keyboards/gummykey/info.json 90 -------------------------------------------------------------------------------
A keyboards/gummykey/keyboard.json 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/gummykey/rules.mk 12 ------------
D keyboards/hand88/info.json 564 -------------------------------------------------------------------------------
A keyboards/hand88/keyboard.json 572 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/hand88/rules.mk 13 -------------
D keyboards/handwired/brain/info.json 112 -------------------------------------------------------------------------------
A keyboards/handwired/brain/keyboard.json 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/brain/rules.mk 12 ------------
D keyboards/handwired/chiron/info.json 118 -------------------------------------------------------------------------------
A keyboards/handwired/chiron/keyboard.json 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/chiron/rules.mk 16 ----------------
D keyboards/handwired/dactyl_manuform/4x5/info.json 143 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_manuform/4x5/keyboard.json 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_manuform/4x5/rules.mk 12 ------------
D keyboards/handwired/dactyl_manuform/4x5_5/info.json 82 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_manuform/4x5_5/rules.mk 11 -----------
D keyboards/handwired/dactyl_manuform/4x6/info.json 99 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_manuform/4x6/keyboard.json 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_manuform/4x6/rules.mk 12 ------------
D keyboards/handwired/dactyl_manuform/4x6_5/info.json 196 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json 204 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_manuform/4x6_5/rules.mk 12 ------------
D keyboards/handwired/dactyl_manuform/5x6/info.json 113 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_manuform/5x6/keyboard.json 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_manuform/5x6/rules.mk 12 ------------
D keyboards/handwired/dactyl_manuform/5x6_2_5/info.json 108 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk 12 ------------
D keyboards/handwired/dactyl_manuform/5x6_5/info.json 104 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_manuform/5x6_5/rules.mk 12 ------------
D keyboards/handwired/dactyl_manuform/5x6_6/info.json 105 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_manuform/5x6_6/rules.mk 12 ------------
D keyboards/handwired/dactyl_manuform/5x7/info.json 123 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_manuform/5x7/keyboard.json 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_manuform/5x7/rules.mk 12 ------------
D keyboards/handwired/dactyl_manuform/6x6_4/info.json 131 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_manuform/6x6_4/rules.mk 12 ------------
D keyboards/handwired/dactyl_promicro/info.json 117 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_promicro/keyboard.json 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_promicro/rules.mk 12 ------------
D keyboards/handwired/dactyl_rah/info.json 116 -------------------------------------------------------------------------------
A keyboards/handwired/dactyl_rah/keyboard.json 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/dactyl_rah/rules.mk 12 ------------
D keyboards/handwired/elrgo_s/info.json 83 -------------------------------------------------------------------------------
A keyboards/handwired/elrgo_s/keyboard.json 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/elrgo_s/rules.mk 12 ------------
D keyboards/handwired/freoduo/info.json 120 -------------------------------------------------------------------------------
A keyboards/handwired/freoduo/keyboard.json 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/freoduo/rules.mk 13 -------------
D keyboards/handwired/jtallbean/split_65/info.json 217 -------------------------------------------------------------------------------
A keyboards/handwired/jtallbean/split_65/keyboard.json 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/jtallbean/split_65/rules.mk 12 ------------
D keyboards/handwired/ks63/info.json 95 -------------------------------------------------------------------------------
A keyboards/handwired/ks63/keyboard.json 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/ks63/rules.mk 12 ------------
D keyboards/handwired/not_so_minidox/info.json 77 -----------------------------------------------------------------------------
A keyboards/handwired/not_so_minidox/keyboard.json 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/not_so_minidox/rules.mk 12 ------------
D keyboards/handwired/skakunm_dactyl/info.json 76 ----------------------------------------------------------------------------
A keyboards/handwired/skakunm_dactyl/keyboard.json 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/skakunm_dactyl/rules.mk 12 ------------
D keyboards/handwired/split65/promicro/info.json 100 -------------------------------------------------------------------------------
A keyboards/handwired/split65/promicro/keyboard.json 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/split65/promicro/rules.mk 13 -------------
D keyboards/handwired/split89/info.json 123 -------------------------------------------------------------------------------
A keyboards/handwired/split89/keyboard.json 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/handwired/split89/rules.mk 12 ------------
D keyboards/hidtech/bastyl/info.json 116 -------------------------------------------------------------------------------
A keyboards/hidtech/bastyl/keyboard.json 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/hidtech/bastyl/rules.mk 12 ------------
D keyboards/kagizaraya/miniaxe/info.json 98 -------------------------------------------------------------------------------
A keyboards/kagizaraya/miniaxe/keyboard.json 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/kagizaraya/miniaxe/rules.mk 14 --------------
D keyboards/kakunpc/rabbit_capture_plan/info.json 131 -------------------------------------------------------------------------------
A keyboards/kakunpc/rabbit_capture_plan/keyboard.json 140 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/kakunpc/rabbit_capture_plan/rules.mk 13 -------------
D keyboards/kbdfans/kbd67/mkiirgb/v2/info.json 127 -------------------------------------------------------------------------------
A keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk 12 ------------
D keyboards/kbdfans/maja/info.json 142 -------------------------------------------------------------------------------
A keyboards/kbdfans/maja/keyboard.json 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/kbdfans/maja/rules.mk 12 ------------
D keyboards/kbdfans/maja_soldered/info.json 110 -------------------------------------------------------------------------------
A keyboards/kbdfans/maja_soldered/keyboard.json 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/kbdfans/maja_soldered/rules.mk 11 -----------
D keyboards/keebio/bfo9000/info.json 148 -------------------------------------------------------------------------------
A keyboards/keebio/bfo9000/keyboard.json 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keebio/bfo9000/rules.mk 12 ------------
D keyboards/keebio/fourier/info.json 107 -------------------------------------------------------------------------------
A keyboards/keebio/fourier/keyboard.json 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keebio/fourier/rules.mk 12 ------------
D keyboards/keebio/iris/rev1/info.json 112 -------------------------------------------------------------------------------
A keyboards/keebio/iris/rev1/keyboard.json 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keebio/iris/rev1/rules.mk 12 ------------
D keyboards/keebio/iris/rev1_led/info.json 111 -------------------------------------------------------------------------------
A keyboards/keebio/iris/rev1_led/keyboard.json 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keebio/iris/rev1_led/rules.mk 12 ------------
D keyboards/keebio/iris/rev5/info.json 142 -------------------------------------------------------------------------------
A keyboards/keebio/iris/rev5/keyboard.json 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keebio/iris/rev5/rules.mk 13 -------------
D keyboards/keebio/nyquist/rev1/info.json 162 -------------------------------------------------------------------------------
A keyboards/keebio/nyquist/rev1/keyboard.json 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keebio/nyquist/rev1/rules.mk 12 ------------
D keyboards/keebio/nyquist/rev2/info.json 166 -------------------------------------------------------------------------------
A keyboards/keebio/nyquist/rev2/keyboard.json 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keebio/nyquist/rev2/rules.mk 12 ------------
D keyboards/keebio/nyquist/rev3/info.json 178 -------------------------------------------------------------------------------
A keyboards/keebio/nyquist/rev3/keyboard.json 188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keebio/nyquist/rev3/rules.mk 12 ------------
D keyboards/keyprez/bison/info.json 352 -------------------------------------------------------------------------------
A keyboards/keyprez/bison/keyboard.json 361 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keyprez/bison/rules.mk 14 --------------
D keyboards/keyprez/unicorn/info.json 124 -------------------------------------------------------------------------------
A keyboards/keyprez/unicorn/keyboard.json 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keyprez/unicorn/rules.mk 13 -------------
D keyboards/keystonecaps/gameroyadvance/info.json 258 -------------------------------------------------------------------------------
A keyboards/keystonecaps/gameroyadvance/keyboard.json 267 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/keystonecaps/gameroyadvance/rules.mk 14 --------------
D keyboards/latincompass/latin17rgb/info.json 106 -------------------------------------------------------------------------------
A keyboards/latincompass/latin17rgb/keyboard.json 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/latincompass/latin17rgb/rules.mk 13 -------------
D keyboards/majistic/info.json 108 -------------------------------------------------------------------------------
A keyboards/majistic/keyboard.json 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/majistic/rules.mk 12 ------------
D keyboards/manta60/info.json 125 -------------------------------------------------------------------------------
A keyboards/manta60/keyboard.json 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/manta60/rules.mk 14 --------------
D keyboards/melgeek/mj61/rev1/info.json 7 -------
A keyboards/melgeek/mj61/rev1/keyboard.json 16 ++++++++++++++++
D keyboards/melgeek/mj61/rev1/rules.mk 12 ------------
D keyboards/melgeek/mj61/rev2/info.json 7 -------
A keyboards/melgeek/mj61/rev2/keyboard.json 16 ++++++++++++++++
D keyboards/melgeek/mj61/rev2/rules.mk 12 ------------
D keyboards/melgeek/mj63/rev1/info.json 7 -------
A keyboards/melgeek/mj63/rev1/keyboard.json 16 ++++++++++++++++
D keyboards/melgeek/mj63/rev1/rules.mk 12 ------------
D keyboards/melgeek/mj63/rev2/info.json 7 -------
A keyboards/melgeek/mj63/rev2/keyboard.json 16 ++++++++++++++++
D keyboards/melgeek/mj63/rev2/rules.mk 12 ------------
D keyboards/melgeek/mj64/rev1/info.json 7 -------
A keyboards/melgeek/mj64/rev1/keyboard.json 16 ++++++++++++++++
D keyboards/melgeek/mj64/rev1/rules.mk 12 ------------
D keyboards/melgeek/mj64/rev2/info.json 7 -------
A keyboards/melgeek/mj64/rev2/keyboard.json 16 ++++++++++++++++
D keyboards/melgeek/mj64/rev2/rules.mk 12 ------------
D keyboards/melgeek/mj64/rev3/info.json 7 -------
A keyboards/melgeek/mj64/rev3/keyboard.json 16 ++++++++++++++++
D keyboards/melgeek/mj64/rev3/rules.mk 12 ------------
D keyboards/merge/um70/info.json 412 -------------------------------------------------------------------------------
A keyboards/merge/um70/keyboard.json 423 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/merge/um70/rules.mk 14 --------------
D keyboards/merge/um80/info.json 155 -------------------------------------------------------------------------------
A keyboards/merge/um80/keyboard.json 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/merge/um80/rules.mk 14 --------------
D keyboards/meson/info.json 156 -------------------------------------------------------------------------------
A keyboards/meson/keyboard.json 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/meson/rules.mk 12 ------------
D keyboards/miller/gm862/info.json 124 -------------------------------------------------------------------------------
A keyboards/miller/gm862/keyboard.json 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/miller/gm862/rules.mk 13 -------------
D keyboards/mint60/info.json 123 -------------------------------------------------------------------------------
A keyboards/mint60/keyboard.json 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/mint60/rules.mk 12 ------------
D keyboards/momoka_ergo/info.json 131 -------------------------------------------------------------------------------
A keyboards/momoka_ergo/keyboard.json 140 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/momoka_ergo/rules.mk 12 ------------
D keyboards/nacly/sodium42/info.json 77 -----------------------------------------------------------------------------
A keyboards/nacly/sodium42/keyboard.json 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/nacly/sodium42/rules.mk 12 ------------
D keyboards/nacly/sodium50/info.json 85 -------------------------------------------------------------------------------
A keyboards/nacly/sodium50/keyboard.json 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/nacly/sodium50/rules.mk 12 ------------
D keyboards/nacly/sodium62/info.json 99 -------------------------------------------------------------------------------
A keyboards/nacly/sodium62/keyboard.json 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/nacly/sodium62/rules.mk 14 --------------
D keyboards/nacly/splitreus62/info.json 106 -------------------------------------------------------------------------------
A keyboards/nacly/splitreus62/keyboard.json 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/nacly/splitreus62/rules.mk 12 ------------
D keyboards/obosob/arch_36/info.json 80 -------------------------------------------------------------------------------
A keyboards/obosob/arch_36/keyboard.json 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/obosob/arch_36/rules.mk 13 -------------
D keyboards/obosob/steal_this_keyboard/info.json 85 -------------------------------------------------------------------------------
A keyboards/obosob/steal_this_keyboard/keyboard.json 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/obosob/steal_this_keyboard/rules.mk 13 -------------
D keyboards/ogre/ergo_single/info.json 122 -------------------------------------------------------------------------------
A keyboards/ogre/ergo_single/keyboard.json 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/ogre/ergo_single/rules.mk 12 ------------
D keyboards/ogre/ergo_split/info.json 127 -------------------------------------------------------------------------------
A keyboards/ogre/ergo_split/keyboard.json 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/ogre/ergo_split/rules.mk 12 ------------
D keyboards/pisces/info.json 71 -----------------------------------------------------------------------
A keyboards/pisces/keyboard.json 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/pisces/rules.mk 12 ------------
D keyboards/pluckey/info.json 199 -------------------------------------------------------------------------------
A keyboards/pluckey/keyboard.json 208 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/pluckey/rules.mk 13 -------------
D keyboards/pteron36/info.json 142 -------------------------------------------------------------------------------
A keyboards/pteron36/keyboard.json 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/pteron36/rules.mk 14 --------------
D keyboards/recompile_keys/cocoa40/info.json 81 -------------------------------------------------------------------------------
A keyboards/recompile_keys/cocoa40/keyboard.json 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/recompile_keys/cocoa40/rules.mk 12 ------------
D keyboards/salicylic_acid3/7splus/info.json 147 -------------------------------------------------------------------------------
A keyboards/salicylic_acid3/7splus/keyboard.json 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/salicylic_acid3/7splus/rules.mk 12 ------------
D keyboards/salicylic_acid3/ajisai74/info.json 112 -------------------------------------------------------------------------------
A keyboards/salicylic_acid3/ajisai74/keyboard.json 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/salicylic_acid3/ajisai74/rules.mk 12 ------------
D keyboards/salicylic_acid3/ergoarrows/info.json 135 -------------------------------------------------------------------------------
A keyboards/salicylic_acid3/ergoarrows/keyboard.json 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/salicylic_acid3/ergoarrows/rules.mk 12 ------------
D keyboards/salicylic_acid3/nknl7en/info.json 133 -------------------------------------------------------------------------------
A keyboards/salicylic_acid3/nknl7en/keyboard.json 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/salicylic_acid3/nknl7en/rules.mk 12 ------------
D keyboards/salicylic_acid3/nknl7jp/info.json 135 -------------------------------------------------------------------------------
A keyboards/salicylic_acid3/nknl7jp/keyboard.json 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/salicylic_acid3/nknl7jp/rules.mk 12 ------------
D keyboards/scatter42/info.json 77 -----------------------------------------------------------------------------
A keyboards/scatter42/keyboard.json 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/scatter42/rules.mk 12 ------------
D keyboards/sparrow62/info.json 99 -------------------------------------------------------------------------------
A keyboards/sparrow62/keyboard.json 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/sparrow62/rules.mk 12 ------------
D keyboards/takashiski/otaku_split/rev0/info.json 108 -------------------------------------------------------------------------------
A keyboards/takashiski/otaku_split/rev0/keyboard.json 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/takashiski/otaku_split/rev0/rules.mk 12 ------------
D keyboards/takashiski/otaku_split/rev1/info.json 116 -------------------------------------------------------------------------------
A keyboards/takashiski/otaku_split/rev1/keyboard.json 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/takashiski/otaku_split/rev1/rules.mk 12 ------------
D keyboards/unikeyboard/diverge3/info.json 114 -------------------------------------------------------------------------------
A keyboards/unikeyboard/diverge3/keyboard.json 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/unikeyboard/diverge3/rules.mk 12 ------------
D keyboards/unikeyboard/divergetm2/info.json 84 -------------------------------------------------------------------------------
A keyboards/unikeyboard/divergetm2/keyboard.json 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/unikeyboard/divergetm2/rules.mk 12 ------------
D keyboards/viktus/sp_mini/info.json 686 -------------------------------------------------------------------------------
A keyboards/viktus/sp_mini/keyboard.json 696 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/viktus/sp_mini/rules.mk 13 -------------

252 files changed, 11579 insertions(+), 11883 deletions(-)
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
@@ -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
@@ -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
@@ -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/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json
@@ -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
@@ -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
@@ -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/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
@@ -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
@@ -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
@@ -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/gummykey/info.json b/keyboards/gummykey/info.json
@@ -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
@@ -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
@@ -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/hand88/info.json b/keyboards/hand88/info.json
@@ -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
@@ -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
@@ -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/brain/info.json b/keyboards/handwired/brain/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json
@@ -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
@@ -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
@@ -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/freoduo/info.json b/keyboards/handwired/freoduo/info.json
@@ -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
@@ -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
@@ -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/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json
@@ -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
@@ -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
@@ -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/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json
@@ -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
@@ -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
@@ -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/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json
@@ -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
@@ -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
@@ -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/split89/info.json b/keyboards/handwired/split89/info.json
@@ -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
@@ -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
@@ -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/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json
@@ -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
@@ -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
@@ -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/kagizaraya/miniaxe/info.json b/keyboards/kagizaraya/miniaxe/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/majistic/info.json b/keyboards/majistic/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/merge/um70/info.json b/keyboards/merge/um70/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/pisces/info.json b/keyboards/pisces/info.json
@@ -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
@@ -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
@@ -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/pluckey/info.json b/keyboards/pluckey/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/scatter42/info.json b/keyboards/scatter42/info.json
@@ -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
@@ -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
@@ -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/sparrow62/info.json b/keyboards/sparrow62/info.json
@@ -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
@@ -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
@@ -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/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json
@@ -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
@@ -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
@@ -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